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

78 files changed, 200 insertions, 200 deletions

diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index fccf143f8fe..c36ef8c7f77 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LINUX_PAM_BUILDLINK3_MK:=	${LINUX_PAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinux-pam}
 BUILDLINK_PACKAGES+=	linux-pam
 
 .if !empty(LINUX_PAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linux-pam+=		PAM>=0.75
-BUILDLINK_RECOMMENDED.linux-pam+=	PAM>=0.77nb5
+BUILDLINK_API_DEPENDS.linux-pam+=		PAM>=0.75
+BUILDLINK_ABI_DEPENDS.linux-pam+=	PAM>=0.77nb5
 BUILDLINK_PKGSRCDIR.linux-pam?=		../../security/PAM
 .endif	# LINUX_PAM_BUILDLINK3_MK
 
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index 47c69c8a802..3250e05c4ef 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:37 reed Exp $
 
 BUILTIN_PKG:=	linux-pam
 
@@ -33,7 +33,7 @@ USE_BUILTIN.linux-pam=	${IS_BUILTIN.linux-pam}
 .    if defined(BUILTIN_PKG.linux-pam) && \
         !empty(IS_BUILTIN.linux-pam:M[yY][eE][sS])
 USE_BUILTIN.linux-pam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.linux-pam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.linux-pam}
 .        if !empty(USE_BUILTIN.linux-pam:M[yY][eE][sS])
 USE_BUILTIN.linux-pam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.linux-pam:Q}; then \
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 15ff5bce332..4cb8ae16c26 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:37 reed Exp $
 #
 
 DISTNAME=       aide-0.10
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=	Free intrusion detection system for checking file integrity
 
-BUILDLINK_DEPENDS.mhash?=	mhash>=0.8.17
+BUILDLINK_API_DEPENDS.mhash?=	mhash>=0.8.17
 
 
 GNU_CONFIGURE=	yes
diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk
index 140bcd35d3f..97ae0e7c0fc 100644
--- a/security/beecrypt/buildlink3.mk
+++ b/security/beecrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BEECRYPT_BUILDLINK3_MK:=	${BEECRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbeecrypt}
 BUILDLINK_PACKAGES+=	beecrypt
 
 .if !empty(BEECRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.beecrypt+=	beecrypt>=3.0.0
-BUILDLINK_RECOMMENDED.beecrypt+=	beecrypt>=3.0.0nb1
+BUILDLINK_API_DEPENDS.beecrypt+=	beecrypt>=3.0.0
+BUILDLINK_ABI_DEPENDS.beecrypt+=	beecrypt>=3.0.0nb1
 BUILDLINK_PKGSRCDIR.beecrypt?=	../../security/beecrypt
 .endif	# BEECRYPT_BUILDLINK3_MK
 
diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk
index edf9869d9f0..be68bf4ec9f 100644
--- a/security/botan/buildlink3.mk
+++ b/security/botan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/13 17:19:42 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BOTAN_BUILDLINK3_MK:=	${BOTAN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbotan}
 BUILDLINK_PACKAGES+=	botan
 
 .if !empty(BOTAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.botan+=	botan>=1.4.11
+BUILDLINK_API_DEPENDS.botan+=	botan>=1.4.11
 BUILDLINK_PKGSRCDIR.botan?=	../../security/botan
 .endif	# BOTAN_BUILDLINK3_MK
 
diff --git a/security/courier-authlib/buildlink3.mk b/security/courier-authlib/buildlink3.mk
index ba1ed43a209..4a3928f4fdc 100644
--- a/security/courier-authlib/buildlink3.mk
+++ b/security/courier-authlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 COURIER_AUTHLIB_BUILDLINK3_MK:=	${COURIER_AUTHLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncourier-authlib}
 BUILDLINK_PACKAGES+=	courier-authlib
 
 .if !empty(COURIER_AUTHLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.courier-authlib+=	courier-authlib>=0.53
-BUILDLINK_RECOMMENDED.courier-authlib?=	courier-authlib>=0.58nb2
+BUILDLINK_API_DEPENDS.courier-authlib+=	courier-authlib>=0.53
+BUILDLINK_ABI_DEPENDS.courier-authlib?=	courier-authlib>=0.58nb2
 BUILDLINK_PKGSRCDIR.courier-authlib?=	../../security/courier-authlib
 .endif	# COURIER_AUTHLIB_BUILDLINK3_MK
 
diff --git a/security/crypto++/buildlink3.mk b/security/crypto++/buildlink3.mk
index f136fd6cf28..21462c2caf6 100644
--- a/security/crypto++/buildlink3.mk
+++ b/security/crypto++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CRYPTOPP_BUILDLINK3_MK:=	${CRYPTOPP_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncryptopp}
 BUILDLINK_PACKAGES+=	cryptopp
 
 .if !empty(CRYPTOPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cryptopp+=	cryptopp>=5.1
+BUILDLINK_API_DEPENDS.cryptopp+=	cryptopp>=5.1
 BUILDLINK_DEPMETHOD.cryptopp?=	build
-BUILDLINK_RECOMMENDED.cryptopp?=	cryptopp>=5.2.1nb1
+BUILDLINK_ABI_DEPENDS.cryptopp?=	cryptopp>=5.2.1nb1
 BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/cryptopp
 .endif	# CRYPTOPP_BUILDLINK3_MK
 
diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk
index d7564824c77..0fdbc9ba41b 100644
--- a/security/cvm/buildlink3.mk
+++ b/security/cvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/08/24 04:49:31 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CVM_BUILDLINK3_MK:=	${CVM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncvm}
 BUILDLINK_PACKAGES+=	cvm
 
 .if !empty(CVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cvm+=		cvm>=0.75
+BUILDLINK_API_DEPENDS.cvm+=		cvm>=0.75
 BUILDLINK_PKGSRCDIR.cvm?=	../../security/cvm
 BUILDLINK_DEPMETHOD.cvm?=	build
 .endif	# CVM_BUILDLINK3_MK
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index 792e0a53039..6f29f2e4a4a 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncyrus-sasl}
 BUILDLINK_PACKAGES+=	cyrus-sasl
 
 .if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
-BUILDLINK_RECOMMENDED.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
+BUILDLINK_API_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
+BUILDLINK_ABI_DEPENDS.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
diff --git a/security/dirb/Makefile b/security/dirb/Makefile
index ea9b6f31b7b..c6c0449539c 100644
--- a/security/dirb/Makefile
+++ b/security/dirb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:22:38 reed Exp $
 #
 
 PKGNAME=	dirb-1.9
@@ -16,7 +16,7 @@ WRKSRC=${WRKDIR}/dirb
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-BUILDLINK_DEPENDS.curl+=	curl>=7.15.0nb1
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.15.0nb1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk
index af3439296e6..83eda256dde 100644
--- a/security/dirmngr/buildlink3.mk
+++ b/security/dirmngr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:38 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DIRMNGR_BUILDLINK3_MK:=	${DIRMNGR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirmngr}
 BUILDLINK_PACKAGES+=	dirmngr
 
 .if !empty(DIRMNGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
-BUILDLINK_RECOMMENDED.dirmngr?=	dirmngr>=0.9.3nb2
+BUILDLINK_API_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
+BUILDLINK_ABI_DEPENDS.dirmngr?=	dirmngr>=0.9.3nb2
 BUILDLINK_PKGSRCDIR.dirmngr?=	../../security/dirmngr
 .endif	# DIRMNGR_BUILDLINK3_MK
 
diff --git a/security/dsniff/Makefile.common b/security/dsniff/Makefile.common
index bab00c8c797..dac3397c1b1 100644
--- a/security/dsniff/Makefile.common
+++ b/security/dsniff/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/03/04 21:30:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/04/06 06:22:38 reed Exp $
 
 DISTNAME=	dsniff-${VERS}
 VERS=		2.3
@@ -10,7 +10,7 @@ HOMEPAGE=	http://monkey.org/~dugsong/dsniff/
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 PATCHDIR=	${.CURDIR}/../dsniff/patches
 DISTINFO_FILE=	${.CURDIR}/../dsniff/distinfo
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index d70ef5ec141..d80abaf2dc5 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/13 18:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:38 reed Exp $
 #
 
 DISTNAME=	gnome-keyring-0.4.9
@@ -19,8 +19,8 @@ USE_PKGLOCALEDIR=	YES
 
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gnome-keyring-1.pc.in
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/security/gnome-keyring/buildlink3.mk b/security/gnome-keyring/buildlink3.mk
index a05768d8281..d252e369e08 100644
--- a/security/gnome-keyring/buildlink3.mk
+++ b/security/gnome-keyring/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:38 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_KEYRING_BUILDLINK3_MK:=	${GNOME_KEYRING_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-keyring}
 BUILDLINK_PACKAGES+=	gnome-keyring
 
 .if !empty(GNOME_KEYRING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
-BUILDLINK_RECOMMENDED.gnome-keyring+=	gnome-keyring>=0.4.6nb2
+BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
+BUILDLINK_ABI_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.6nb2
 BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index cc023f367fb..add8c84b36a 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:38 reed Exp $
 #
 
 DISTNAME=		gnupg-1.9.20
@@ -54,7 +54,7 @@ PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
 pre-configure:
 	cd  ${WRKDIR}/pth-2.0.4 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/gnupg-devel/buildlink3.mk b/security/gnupg-devel/buildlink3.mk
index 5ef7b041458..acf66e332be 100644
--- a/security/gnupg-devel/buildlink3.mk
+++ b/security/gnupg-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:38 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUPG_DEVEL_BUILDLINK3_MK:=	${GNUPG_DEVEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnupg-devel}
 BUILDLINK_PACKAGES+=	gnupg-devel
 
 .if !empty(GNUPG_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.11
-BUILDLINK_RECOMMENDED.gnupg-devel+=	gnupg-devel>=1.9.20nb1
+BUILDLINK_API_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.11
+BUILDLINK_ABI_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.20nb1
 BUILDLINK_PKGSRCDIR.gnupg-devel?=	../../security/gnupg-devel
 .endif	# GNUPG_DEVEL_BUILDLINK3_MK
 BUILDLINK_PREFIX.gnupg-devel?=	${LOCALBASE}
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 1472c0ad774..94c97b08775 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:22:38 reed Exp $
 
 DISTNAME=	gnutls-1.3.5
 CATEGORIES=	security devel
@@ -24,9 +24,9 @@ INFO_FILES=		# PLIST
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
 
-BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.5
-BUILDLINK_DEPENDS.libtasn1+=	libtasn1>=0.3.1
-BUILDLINK_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2
+BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.5
+BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.1
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2
 
 MAKE_ENV+=		RM=${RM:Q}
 MAKE_ENV+=		TZ=UTC
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index a29317e55bd..cceb504bbd5 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/03/06 00:18:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:38 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNUTLS_BUILDLINK3_MK:=	${GNUTLS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnutls}
 BUILDLINK_PACKAGES+=	gnutls
 
 .if !empty(GNUTLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.0.13
-BUILDLINK_RECOMMENDED.gnutls+=	gnutls>=1.3.4nb1
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.0.13
+BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=1.3.4nb1
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .endif	# GNUTLS_BUILDLINK3_MK
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 026d40b2f0a..4359139cf31 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/04/06 06:22:38 reed Exp $
 #
 
 DISTNAME=	gpgme-1.0.3
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .include "../../security/libgpg-error/buildlink3.mk"
 
 # we want the getenv_r() semantics of NetBSD-current
-BUILDLINK_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
+BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
 .include "../../devel/librfuncs/buildlink3.mk"
 
 ##
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 4246f621aa7..ea82d167667 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:38 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPGME_BUILDLINK3_MK:=	${GPGME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme}
 BUILDLINK_PACKAGES+=	gpgme
 
 .if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=0.9.0
-BUILDLINK_RECOMMENDED.gpgme+=	gpgme>=1.0.3nb1
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=0.9.0
+BUILDLINK_ABI_DEPENDS.gpgme+=	gpgme>=1.0.3nb1
 BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
 .endif	# GPGME_BUILDLINK3_MK
 
diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk
index 9fd437d49b4..df5f0eb6ee2 100644
--- a/security/gpgme03/buildlink3.mk
+++ b/security/gpgme03/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:39 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPGME03_BUILDLINK3_MK:=	${GPGME03_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngpgme03}
 BUILDLINK_PACKAGES+=	gpgme03
 
 .if !empty(GPGME03_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme03+=	gpgme03>=0.3.16
-BUILDLINK_RECOMMENDED.gpgme03+=	gpgme03>=0.3.16nb2
+BUILDLINK_API_DEPENDS.gpgme03+=	gpgme03>=0.3.16
+BUILDLINK_ABI_DEPENDS.gpgme03+=	gpgme03>=0.3.16nb2
 BUILDLINK_PKGSRCDIR.gpgme03?=	../../security/gpgme03
 
 BUILDLINK_FILES.gpgme03+=	bin/gpgme03-config
diff --git a/security/gsasl/buildlink3.mk b/security/gsasl/buildlink3.mk
index 855bcd9bd2a..213d7241843 100644
--- a/security/gsasl/buildlink3.mk
+++ b/security/gsasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:39 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSASL_BUILDLINK3_MK:=	${GSASL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsasl}
 BUILDLINK_PACKAGES+=	gsasl
 
 .if !empty(GSASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsasl+=	gsasl>=0.2.3
-BUILDLINK_RECOMMENDED.gsasl?=	gsasl>=0.2.5nb1
+BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.3
+BUILDLINK_ABI_DEPENDS.gsasl?=	gsasl>=0.2.5nb1
 BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
 .endif	# GSASL_BUILDLINK3_MK
 
diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk
index 28c3a6d40bf..c3e3cbc8aa5 100644
--- a/security/gss/buildlink3.mk
+++ b/security/gss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSS_BUILDLINK3_MK:=	${GSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngss}
 BUILDLINK_PACKAGES+=	gss
 
 .if !empty(GSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gss+=		gss>=0.0.6nb1
-BUILDLINK_RECOMMENDED.gss+=	gss>=0.0.13nb1
+BUILDLINK_API_DEPENDS.gss+=		gss>=0.0.6nb1
+BUILDLINK_ABI_DEPENDS.gss+=	gss>=0.0.13nb1
 BUILDLINK_PKGSRCDIR.gss?=	../../security/gss
 .endif	# GSS_BUILDLINK3_MK
 
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 05445f58a99..8b0b01bbb8e 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2005/10/26 15:12:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2006/04/06 06:22:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nheimdal}
 BUILDLINK_PACKAGES+=	heimdal
 
 .if !empty(HEIMDAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.4e
-BUILDLINK_RECOMMENDED.heimdal+=	heimdal>=0.6.3nb2
+BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.4e
+BUILDLINK_ABI_DEPENDS.heimdal+=	heimdal>=0.6.3nb2
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
 .endif	# HEIMDAL_BUILDLINK3_MK
diff --git a/security/heimdal/builtin.mk b/security/heimdal/builtin.mk
index e212ea11135..d5e3a871db1 100644
--- a/security/heimdal/builtin.mk
+++ b/security/heimdal/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:41 reed Exp $
 
 BUILTIN_PKG:=	heimdal
 
@@ -74,7 +74,7 @@ USE_BUILTIN.heimdal=	${IS_BUILTIN.heimdal}
 .    if defined(BUILTIN_PKG.heimdal) && \
         !empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
 USE_BUILTIN.heimdal=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.heimdal}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
 .        if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
 USE_BUILTIN.heimdal!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \
@@ -97,7 +97,7 @@ CHECK_BUILTIN.heimdal?=	no
 .if !empty(CHECK_BUILTIN.heimdal:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.heimdal:M[nN][oO])
-BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.6
+BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.6
 
 KRB5_CONFIG?=	${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index b03e046049d..bfba72f460a 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 00:18:29 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:42 reed Exp $
 #
 
 DISTNAME=	${PKGNAME}-src
@@ -32,7 +32,7 @@ SUBST_MESSAGE.build=	Patching build files.
 USE_OLD_DES_API=	YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-BUILDLINK_DEPENDS.libssh+=	libssh-0.11
+BUILDLINK_API_DEPENDS.libssh+=	libssh-0.11
 
 INSTALLATION_DIRS=	bin
 
diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk
index 1afa6b01ce1..636c7733d5d 100644
--- a/security/kth-krb4/buildlink3.mk
+++ b/security/kth-krb4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:42 reed Exp $
 # XXX	BUILDLINK_DEPMETHOD.kth-krb4?=	build
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -12,9 +12,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkth-krb4}
 BUILDLINK_PACKAGES+=	kth-krb4
 
 .if !empty(KTH_KRB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
-BUILDLINK_RECOMMENDED.kth-krb4+=kth-krb4>=1.2.1nb5
-BUILDLINK_RECOMMENDED.kth-krb4?=	kth-krb4>=1.2.1nb6
+BUILDLINK_API_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
+BUILDLINK_ABI_DEPENDS.kth-krb4+=kth-krb4>=1.2.1nb5
+BUILDLINK_ABI_DEPENDS.kth-krb4?=	kth-krb4>=1.2.1nb6
 BUILDLINK_PKGSRCDIR.kth-krb4?=	../../security/kth-krb4
 .endif	# KTH_KRB4_BUILDLINK3_MK
 
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index a427b364bc9..492e89435c7 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:42 reed Exp $
 #
 
 DISTNAME=		libassuan-0.6.10
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 INFO_FILES=		# PLIST
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libassuan/buildlink3.mk b/security/libassuan/buildlink3.mk
index 351e4b6f2ee..8a22788afae 100644
--- a/security/libassuan/buildlink3.mk
+++ b/security/libassuan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBASSUAN_BUILDLINK3_MK:=	${LIBASSUAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibassuan}
 BUILDLINK_PACKAGES+=	libassuan
 
 .if !empty(LIBASSUAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassuan+=	libassuan>=0.6.7
-BUILDLINK_RECOMMENDED.libassuan?=	libassuan>=0.6.10nb2
+BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=0.6.7
+BUILDLINK_ABI_DEPENDS.libassuan?=	libassuan>=0.6.10nb2
 BUILDLINK_PKGSRCDIR.libassuan?=	../../security/libassuan
 .endif	# LIBASSUAN_BUILDLINK3_MK
 
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index 3169e073e17..49a56ff0889 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCRACK_BUILDLINK3_MK:=	${LIBCRACK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcrack}
 BUILDLINK_PACKAGES+=	libcrack
 
 .if !empty(LIBCRACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcrack+=	libcrack>=2.7
-BUILDLINK_RECOMMENDED.libcrack+=	libcrack>=2.7nb1
+BUILDLINK_API_DEPENDS.libcrack+=	libcrack>=2.7
+BUILDLINK_ABI_DEPENDS.libcrack+=	libcrack>=2.7nb1
 BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 .endif	# LIBCRACK_BUILDLINK3_MK
 
diff --git a/security/libdes/buildlink3.mk b/security/libdes/buildlink3.mk
index c826a5aa5db..3362b944c57 100644
--- a/security/libdes/buildlink3.mk
+++ b/security/libdes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 20:46:28 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDES_BUILDLINK3_MK:=	${LIBDES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdes}
 BUILDLINK_PACKAGES+=	libdes
 
 .if !empty(LIBDES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdes+=	libdes>=4.04b
+BUILDLINK_API_DEPENDS.libdes+=	libdes>=4.04b
 BUILDLINK_PKGSRCDIR.libdes?=	../../security/libdes
 BUILDLINK_DEPMETHOD.libdes?=	build
 .endif	# LIBDES_BUILDLINK3_MK
diff --git a/security/libdes/builtin.mk b/security/libdes/builtin.mk
index 0e383ed6c6c..0d20f7a6aa0 100644
--- a/security/libdes/builtin.mk
+++ b/security/libdes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
 
 BUILTIN_PKG:=	libdes
 
@@ -31,7 +31,7 @@ USE_BUILTIN.libdes=	${IS_BUILTIN.libdes}
 .    if defined(BUILTIN_PKG.libdes) && \
         !empty(IS_BUILTIN.libdes:M[yY][eE][sS])
 USE_BUILTIN.libdes=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libdes}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libdes}
 .        if !empty(USE_BUILTIN.libdes:M[yY][eE][sS])
 USE_BUILTIN.libdes!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libdes:Q}; then	\
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index ac5be18e074..8fc0e314abf 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/12 06:56:30 minskim Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:42 reed Exp $
 
 DISTNAME=	libfwbuilder-2.0.10
 PKGREVISION=	5
@@ -19,7 +19,7 @@ USE_LANGUAGES=	c++
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libfwbuilder/buildlink3.mk b/security/libfwbuilder/buildlink3.mk
index 511b79e585f..9a35117acc5 100644
--- a/security/libfwbuilder/buildlink3.mk
+++ b/security/libfwbuilder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/03/03 01:29:40 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFWBUILDER_BUILDLINK3_MK:=	${LIBFWBUILDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibfwbuilder}
 BUILDLINK_PACKAGES+=	libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
-BUILDLINK_RECOMMENDED.libfwbuilder?=	libfwbuilder>=2.0.10nb2
+BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
+BUILDLINK_ABI_DEPENDS.libfwbuilder?=	libfwbuilder>=2.0.10nb2
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
diff --git a/security/libgcrypt/buildlink3.mk b/security/libgcrypt/buildlink3.mk
index 532f2666c16..84807ef856d 100644
--- a/security/libgcrypt/buildlink3.mk
+++ b/security/libgcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGCRYPT_BUILDLINK3_MK:=	${LIBGCRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgcrypt}
 BUILDLINK_PACKAGES+=	libgcrypt
 
 .if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
-BUILDLINK_RECOMMENDED.libgcrypt+=	libgcrypt>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
+BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
 .endif	# LIBGCRYPT_BUILDLINK3_MK
 
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index e43236f2817..adae61d7027 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPG_ERROR_BUILDLINK3_MK:=	${LIBGPG_ERROR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgpg-error}
 BUILDLINK_PACKAGES+=	libgpg-error
 
 .if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=0.6
-BUILDLINK_RECOMMENDED.libgpg-error+=	libgpg-error>=1.0nb1
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=0.6
+BUILDLINK_ABI_DEPENDS.libgpg-error+=	libgpg-error>=1.0nb1
 BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
 .endif	# LIBGPG_ERROR_BUILDLINK3_MK
 
diff --git a/security/libidea/buildlink3.mk b/security/libidea/buildlink3.mk
index c360757bf2e..5b08b5a7db2 100644
--- a/security/libidea/buildlink3.mk
+++ b/security/libidea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 18:48:41 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDEA_BUILDLINK3_MK:=	${LIBIDEA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibidea}
 BUILDLINK_PACKAGES+=	libidea
 
 .if !empty(LIBIDEA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidea+=	libidea>=0.8.2
+BUILDLINK_API_DEPENDS.libidea+=	libidea>=0.8.2
 BUILDLINK_PKGSRCDIR.libidea?=	../../security/libidea
 BUILDLINK_DEPMETHOD.libidea?=	build
 .endif	# LIBIDEA_BUILDLINK3_MK
diff --git a/security/libident/buildlink3.mk b/security/libident/buildlink3.mk
index 5b64b5e143e..8cd8b69eb92 100644
--- a/security/libident/buildlink3.mk
+++ b/security/libident/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBIDENT_BUILDLINK3_MK:=	${LIBIDENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibident}
 BUILDLINK_PACKAGES+=	libident
 
 .if !empty(LIBIDENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libident+=	libident>=0.22
-BUILDLINK_RECOMMENDED.libident+=	libident>=0.22nb1
+BUILDLINK_API_DEPENDS.libident+=	libident>=0.22
+BUILDLINK_ABI_DEPENDS.libident+=	libident>=0.22nb1
 BUILDLINK_PKGSRCDIR.libident?=	../../security/libident
 .endif	# LIBIDENT_BUILDLINK3_MK
 
diff --git a/security/libksba/buildlink3.mk b/security/libksba/buildlink3.mk
index a0d40df53c8..e9cc5aa9413 100644
--- a/security/libksba/buildlink3.mk
+++ b/security/libksba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBKSBA_BUILDLINK3_MK:=	${LIBKSBA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibksba}
 BUILDLINK_PACKAGES+=	libksba
 
 .if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+=	libksba>=0.9.7
-BUILDLINK_RECOMMENDED.libksba+=	libksba>=0.9.13nb1
+BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.9.7
+BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba
 .endif	# LIBKSBA_BUILDLINK3_MK
 
diff --git a/security/libksba04/buildlink3.mk b/security/libksba04/buildlink3.mk
index d60e35cc131..0a1a2b382d4 100644
--- a/security/libksba04/buildlink3.mk
+++ b/security/libksba04/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBKSBA_BUILDLINK3_MK:=	${LIBKSBA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibksba}
 BUILDLINK_PACKAGES+=	libksba
 
 .if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+=	libksba>=0.4.7nb1
-BUILDLINK_RECOMMENDED.libksba+=	libksba>=0.4.7nb2
+BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.4.7nb1
+BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.4.7nb2
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba04
 .endif	# LIBKSBA_BUILDLINK3_MK
 
diff --git a/security/libmcrypt/buildlink3.mk b/security/libmcrypt/buildlink3.mk
index 4ec6c3b4183..5b36b925705 100644
--- a/security/libmcrypt/buildlink3.mk
+++ b/security/libmcrypt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMCRYPT_BUILDLINK3_MK:=	${LIBMCRYPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmcrypt}
 BUILDLINK_PACKAGES+=	libmcrypt
 
 .if !empty(LIBMCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmcrypt+=	libmcrypt>=2.5.6
-BUILDLINK_RECOMMENDED.libmcrypt+=	libmcrypt>=2.5.7nb1
+BUILDLINK_API_DEPENDS.libmcrypt+=	libmcrypt>=2.5.6
+BUILDLINK_ABI_DEPENDS.libmcrypt+=	libmcrypt>=2.5.7nb1
 BUILDLINK_PKGSRCDIR.libmcrypt?=	../../security/libmcrypt
 .endif	# LIBMCRYPT_BUILDLINK3_MK
 
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
index fdee6b0fe4c..1fc245b228f 100644
--- a/security/libnasl/buildlink3.mk
+++ b/security/libnasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/02/21 10:08:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
 # XXX	BUILDLINK_DEPMETHOD.libnasl?=	build
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnasl}
 BUILDLINK_PACKAGES+=	libnasl
 
 .if !empty(LIBNASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnasl+=	libnasl>=2.2.3
-BUILDLINK_RECOMMENDED.libnasl?=	libnasl>=2.2.3
+BUILDLINK_API_DEPENDS.libnasl+=	libnasl>=2.2.3
+BUILDLINK_ABI_DEPENDS.libnasl?=	libnasl>=2.2.3
 BUILDLINK_PKGSRCDIR.libnasl?=	../../security/libnasl
 .endif	# LIBNASL_BUILDLINK3_MK
 
diff --git a/security/libprelude/buildlink3.mk b/security/libprelude/buildlink3.mk
index 7586e93baa9..62ff9e5233f 100644
--- a/security/libprelude/buildlink3.mk
+++ b/security/libprelude/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/10 22:19:29 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:42 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPRELUDE_BUILDLINK3_MK:=	${LIBPRELUDE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibprelude}
 BUILDLINK_PACKAGES+=	libprelude
 
 .if !empty(LIBPRELUDE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libprelude+=	libprelude>=0.9.0
-BUILDLINK_RECOMMENDED.libprelude?=	libprelude>=0.9.7
+BUILDLINK_API_DEPENDS.libprelude+=	libprelude>=0.9.0
+BUILDLINK_ABI_DEPENDS.libprelude?=	libprelude>=0.9.7
 BUILDLINK_PKGSRCDIR.libprelude?=	../../security/libprelude
 .endif	# LIBPRELUDE_BUILDLINK3_MK
 
diff --git a/security/libpreludedb/buildlink3.mk b/security/libpreludedb/buildlink3.mk
index 4b50ec3b2ee..d80b6254ad8 100644
--- a/security/libpreludedb/buildlink3.mk
+++ b/security/libpreludedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/10 22:44:50 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPRELUDEDB_BUILDLINK3_MK:=	${LIBPRELUDEDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpreludedb}
 BUILDLINK_PACKAGES+=	libpreludedb
 
 .if !empty(LIBPRELUDEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpreludedb+=	libpreludedb>=0.9.3
-BUILDLINK_RECOMMENDED.libpreludedb?=	libpreludedb>=0.9.6
+BUILDLINK_API_DEPENDS.libpreludedb+=	libpreludedb>=0.9.3
+BUILDLINK_ABI_DEPENDS.libpreludedb?=	libpreludedb>=0.9.6
 BUILDLINK_PKGSRCDIR.libpreludedb?=	../../security/libpreludedb
 .endif	# LIBPRELUDEDB_BUILDLINK3_MK
 
diff --git a/security/libssh/buildlink3.mk b/security/libssh/buildlink3.mk
index 648f030b957..489a604f066 100644
--- a/security/libssh/buildlink3.mk
+++ b/security/libssh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 00:20:17 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSSH_BUILDLINK3_MK:=	${NETWIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibssh}
 BUILDLINK_PACKAGES+=	libssh
 
 .if !empty(LIBSSH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libssh+=	libssh>=0.11
+BUILDLINK_API_DEPENDS.libssh+=	libssh>=0.11
 BUILDLINK_PKGSRCDIR.libssh?=	../../security/libssh
 .endif	# LIBSSH_BUILDLINK3_MK
 
diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk
index 8fef1298346..5c91269a031 100644
--- a/security/libtasn1/buildlink3.mk
+++ b/security/libtasn1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/06 00:18:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTASN1_BUILDLINK3_MK:=	${LIBTASN1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtasn1}
 BUILDLINK_PACKAGES+=	libtasn1
 
 .if !empty(LIBTASN1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtasn1+=	libtasn1>=0.2.7
-BUILDLINK_RECOMMENDED.libtasn1+=	libtasn1>=0.3.0
+BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.2.7
+BUILDLINK_ABI_DEPENDS.libtasn1+=	libtasn1>=0.3.0
 BUILDLINK_PKGSRCDIR.libtasn1?=	../../security/libtasn1
 .endif	# LIBTASN1_BUILDLINK3_MK
 
diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk
index 6b051d69e30..d1d2a0e1dfe 100644
--- a/security/libtcpa/buildlink3.mk
+++ b/security/libtcpa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBTCPA_BUILDLINK3_MK:=	${LIBTCPA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtcpa}
 BUILDLINK_PACKAGES+=	libtcpa
 
 .if !empty(LIBTCPA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtcpa+=	libtcpa>=1.1b
-BUILDLINK_RECOMMENDED.libtcpa?=	libtcpa>=1.1bnb1
+BUILDLINK_API_DEPENDS.libtcpa+=	libtcpa>=1.1b
+BUILDLINK_ABI_DEPENDS.libtcpa?=	libtcpa>=1.1bnb1
 BUILDLINK_PKGSRCDIR.libtcpa?=	../../security/libtcpa
 BUILDLINK_DEPMETHOD.libtcpa?=	build
 .endif	# LIBTCPA_BUILDLINK3_MK
diff --git a/security/mhash/buildlink3.mk b/security/mhash/buildlink3.mk
index 885bab4eb67..ad13b49a818 100644
--- a/security/mhash/buildlink3.mk
+++ b/security/mhash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MHASH_BUILDLINK3_MK:=	${MHASH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmhash}
 BUILDLINK_PACKAGES+=	mhash
 
 .if !empty(MHASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mhash+=	mhash>=0.8.3
-BUILDLINK_RECOMMENDED.mhash+=	mhash>=0.9.2nb1
+BUILDLINK_API_DEPENDS.mhash+=	mhash>=0.8.3
+BUILDLINK_ABI_DEPENDS.mhash+=	mhash>=0.9.2nb1
 BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
 .endif	# MHASH_BUILDLINK3_MK
 
diff --git a/security/mit-krb5/buildlink3.mk b/security/mit-krb5/buildlink3.mk
index 04441a84b9b..5f1cf216b26 100644
--- a/security/mit-krb5/buildlink3.mk
+++ b/security/mit-krb5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/04/16 14:32:53 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MIT_KRB5_BUILDLINK3_MK:=	${MIT_KRB5_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmit-krb5}
 BUILDLINK_PACKAGES+=	mit-krb5
 
 .if !empty(MIT_KRB5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mit-krb5+=		mit-krb5>=1.3.1
-BUILDLINK_RECOMMENDED.mit-krb5+=	mit-krb5>=1.4nb1
+BUILDLINK_API_DEPENDS.mit-krb5+=		mit-krb5>=1.3.1
+BUILDLINK_ABI_DEPENDS.mit-krb5+=	mit-krb5>=1.4nb1
 BUILDLINK_PKGSRCDIR.mit-krb5?=		../../security/mit-krb5
 .endif	# MIT_KRB5_BUILDLINK3_MK
 
diff --git a/security/mixminion/Makefile b/security/mixminion/Makefile
index d81f5c51ac1..1b8d618a512 100644
--- a/security/mixminion/Makefile
+++ b/security/mixminion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:43 reed Exp $
 #
 
 DISTNAME=		Mixminion-0.0.7.1
@@ -11,7 +11,7 @@ MAINTAINER=		pdh@wiredyne.com
 HOMEPAGE=		http://mixminion.net/
 COMMENT=		Mixminion impedes message traffic analysis
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7d
 
 CRYPTO=				YES
 PYTHON_VERSIONS_ACCEPTED=       23 22 21
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index d9b3e97b9e7..3f1ae5102a6 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
 BUILDLINK_PACKAGES+=	nessus-core
 
 .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-core+=		nessus-core>=2.2.3
-BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.2.6
+BUILDLINK_API_DEPENDS.nessus-core+=		nessus-core>=2.2.3
+BUILDLINK_ABI_DEPENDS.nessus-core?=	nessus-core>=2.2.6
 BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
 .endif	# NESSUS_CORE_BUILDLINK3_MK
 
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
index f816757635a..0ec943291ab 100644
--- a/security/nessus-libraries/buildlink3.mk
+++ b/security/nessus-libraries/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/29 17:05:54 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 NESSUS_LIBRARIES_BUILDLINK3_MK:=	${NESSUS_LIBRARIES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-libraries}
 BUILDLINK_PACKAGES+=	nessus-libraries
 
 .if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.3
+BUILDLINK_API_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.3
 BUILDLINK_PKGSRCDIR.nessus-libraries?=	../../security/nessus-libraries
 .endif	# NESSUS_LIBRARIES_BUILDLINK3_MK
 
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
index ce79b74fbf1..dab23c600c7 100644
--- a/security/opencdk/buildlink3.mk
+++ b/security/opencdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENCDK_BUILDLINK3_MK:=	${OPENCDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopencdk}
 BUILDLINK_PACKAGES+=	opencdk
 
 .if !empty(OPENCDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
-BUILDLINK_RECOMMENDED.opencdk+=	opencdk>=0.5.8nb1
+BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
+BUILDLINK_ABI_DEPENDS.opencdk+=	opencdk>=0.5.8nb1
 BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
 .endif	# OPENCDK_BUILDLINK3_MK
 
diff --git a/security/openpam/buildlink3.mk b/security/openpam/buildlink3.mk
index e2c14dad32d..80f1bcdacb0 100644
--- a/security/openpam/buildlink3.mk
+++ b/security/openpam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/01/13 21:59:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENPAM_BUILDLINK3_MK:=	${OPENPAM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenpam}
 BUILDLINK_PACKAGES+=	openpam
 
 .if !empty(OPENPAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openpam+=	openpam>=20040210
+BUILDLINK_API_DEPENDS.openpam+=	openpam>=20040210
 BUILDLINK_PKGSRCDIR.openpam?=	../../security/openpam
 .endif	# OPENPAM_BUILDLINK3_MK
 
diff --git a/security/openpam/builtin.mk b/security/openpam/builtin.mk
index d014f858f03..212bf8c0b2c 100644
--- a/security/openpam/builtin.mk
+++ b/security/openpam/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:43 reed Exp $
 
 BUILTIN_PKG:=	openpam
 
@@ -45,7 +45,7 @@ USE_BUILTIN.openpam=	${IS_BUILTIN.openpam}
 .    if defined(BUILTIN_PKG.openpam) && \
         !empty(IS_BUILTIN.openpam:M[yY][eE][sS])
 USE_BUILTIN.openpam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.openpam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.openpam}
 .        if !empty(USE_BUILTIN.openpam:M[yY][eE][sS])
 USE_BUILTIN.openpam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openpam:Q}; then \
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 82a846a07e2..b3945811336 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2006/02/05 23:10:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2006/04/06 06:22:43 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenssl}
 BUILDLINK_PACKAGES+=	openssl
 
 .if !empty(OPENSSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6m
-BUILDLINK_RECOMMENDED.openssl+=	openssl>=0.9.7inb1
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.6m
+BUILDLINK_ABI_DEPENDS.openssl+=	openssl>=0.9.7inb1
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl
 
 # Ensure that -lcrypt comes before -lcrypto when linking so that the
diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk
index 07c7dcd6dd9..d371540fa9f 100644
--- a/security/openssl/builtin.mk
+++ b/security/openssl/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.19 2006/04/06 06:22:43 reed Exp $
 
 BUILTIN_PKG:=	openssl
 
@@ -112,7 +112,7 @@ USE_BUILTIN.openssl=	${IS_BUILTIN.openssl}
 .    if defined(BUILTIN_PKG.openssl) && \
         !empty(IS_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.openssl}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.openssl}
 .        if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \
diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile
index 5f9ec9caac8..043876bb9b1 100644
--- a/security/p5-Net-DNS-SEC/Makefile
+++ b/security/p5-Net-DNS-SEC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:43 reed Exp $
 #
 
 DISTNAME=		Net-DNS-SEC-0.12
@@ -20,7 +20,7 @@ DEPENDS+=		p5-Digest-SHA1>=2.04:../../security/p5-Digest-SHA1
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
 
-BUILDLINK_DEPENDS.perl+=	perl>=5.6.1
+BUILDLINK_API_DEPENDS.perl+=	perl>=5.6.1
 
 PERL5_PACKLIST=		auto/Net/DNS/SEC/.packlist
 
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index 98b330de2e8..311f843216f 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:37 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	pakemon-0.3.1
 PKGREVISION=	3
@@ -13,7 +13,7 @@ COMMENT=	Packet monster, an Open Source Intrusion Detection System
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 post-extract:
 	${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in
diff --git a/security/pflkm/buildlink3.mk b/security/pflkm/buildlink3.mk
index b3abe5b5036..3667ff67cc5 100644
--- a/security/pflkm/buildlink3.mk
+++ b/security/pflkm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/07 19:11:54 peter Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PFLKM_BUILDLINK3_MK:=	${PFLKM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npflkm}
 BUILDLINK_PACKAGES+=	pflkm
 
 .if !empty(PFLKM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pflkm+=	pflkm>=20040501
+BUILDLINK_API_DEPENDS.pflkm+=	pflkm>=20040501
 BUILDLINK_PKGSRCDIR.pflkm?=	../../security/pflkm
 .endif	# PFLKM_BUILDLINK3_MK
 
diff --git a/security/pflkm/builtin.mk b/security/pflkm/builtin.mk
index a9695aeab83..3c65b587d2a 100644
--- a/security/pflkm/builtin.mk
+++ b/security/pflkm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:44 reed Exp $
 
 BUILTIN_PKG:=	pflkm
 
@@ -79,7 +79,7 @@ USE_BUILTIN.pflkm=	${IS_BUILTIN.pflkm}
 .    if defined(BUILTIN_PKG.pflkm) && \
         !empty(IS_BUILTIN.pflkm:M[yY][eE][sS])
 USE_BUILTIN.pflkm=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.pflkm}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.pflkm}
 .        if !empty(USE_BUILTIN.pflkm:M[yY][eE][sS])
 USE_BUILTIN.pflkm!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.pflkm:Q}; then	\
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index c401ffe1b6a..de4da4c6261 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/31 23:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:44 reed Exp $
 #
 
 DISTNAME=		pinentry-0.7.1
@@ -38,7 +38,7 @@ PLIST_SUBST+=		USE_QT=
 PLIST_SUBST+=		USE_QT='@comment '
 .endif
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk
index 0d04238a849..9387d34abed 100644
--- a/security/pinentry/buildlink3.mk
+++ b/security/pinentry/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PINENTRY_BUILDLINK3_MK:=	${PINENTRY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npinentry}
 BUILDLINK_PACKAGES+=	pinentry
 
 .if !empty(PINENTRY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pinentry+=	pinentry>=0.7.1
-BUILDLINK_RECOMMENDED.pinentry?=	pinentry>=0.7.1nb3
+BUILDLINK_API_DEPENDS.pinentry+=	pinentry>=0.7.1
+BUILDLINK_ABI_DEPENDS.pinentry?=	pinentry>=0.7.1nb3
 BUILDLINK_PKGSRCDIR.pinentry?=	../../security/pinentry
 .endif	# PINENTRY_BUILDLINK3_MK
 
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index afba76f4079..39ed7dfc633 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:44 reed Exp $
 #
 
 DISTNAME=		m2crypto-0.13
@@ -22,7 +22,7 @@ PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
 # it seems, and 0.9.7i is the version which currently is
 # in pkgsrc and against which I fixed m2crypto to compile.
 # -- wiz 20060115
-BUILDLINK_DEPENDS.openssl+=	openssl-0.9.7i{,nb*}
+BUILDLINK_API_DEPENDS.openssl+=	openssl-0.9.7i{,nb*}
 
 .include "../../lang/python/extension.mk"
 .include "../../devel/swig/buildlink3.mk"
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 27a4b6204db..f6fd697caf4 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/13 21:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	qca-tls-1.0
 PKGREVISION=	2
@@ -19,6 +19,6 @@ CONFIGURE_ARGS+=        --with-openssl-lib=${SSLBASE}/lib
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 904e9dd6f1b..4f1de37d699 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/13 21:56:22 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	qca-1.0
 PKGREVISION=	2
@@ -17,6 +17,6 @@ HAS_CONFIGURE=	yes
 INSTALLATION_DIRS=	include lib
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/qca/buildlink3.mk b/security/qca/buildlink3.mk
index 86f04a70910..5fd78fbd997 100644
--- a/security/qca/buildlink3.mk
+++ b/security/qca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
 # 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QCA_BUILDLINK3_MK:=	${QCA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqca}
 BUILDLINK_PACKAGES+=	qca
 
 .if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qca+=	qca>=1.0
-BUILDLINK_RECOMMENDED.qca?=	qca>=1.0nb2
+BUILDLINK_API_DEPENDS.qca+=	qca>=1.0
+BUILDLINK_ABI_DEPENDS.qca?=	qca>=1.0nb2
 BUILDLINK_PKGSRCDIR.qca?=	../../security/qca
 .endif	# QCA_BUILDLINK3_MK
 
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index e6ea16ae532..52030bd18d6 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 19:59:38 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RSAREF_BUILDLINK3_MK:=	${RSAREF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrsaref}
 BUILDLINK_PACKAGES+=	rsaref
 
 .if !empty(RSAREF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rsaref+=	rsaref>=2.0p3
-BUILDLINK_RECOMMENDED.rsaref+=	rsaref>=2.0p3nb1
+BUILDLINK_API_DEPENDS.rsaref+=	rsaref>=2.0p3
+BUILDLINK_ABI_DEPENDS.rsaref+=	rsaref>=2.0p3nb1
 BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 .endif	# RSAREF_BUILDLINK3_MK
 
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index c42ec7e7de6..934b466e601 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGNAME=	seahorse-gedit-0.8.1
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-nautilus
 
 GCONF2_SCHEMAS= 	seahorse-gedit.schemas
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 BUILD_DIRS=	plugins/gedit
 INSTALL_DIRS=	plugins/gedit
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index be28eaddc1f..bd0657939f9 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/03/21 06:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGNAME=	seahorse-nautilus-0.8.1
@@ -24,7 +24,7 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--disable-gedit
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 BUILD_DIRS=	plugins/nautilus-ext
 INSTALL_DIRS=	plugins/nautilus-ext
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 576119b7d6d..861489a5ec2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/03/21 06:00:48 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	seahorse-0.8.1
 PKGREVISION=	1
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--disable-nautilus
 
 GCONF2_SCHEMAS= 	seahorse.schemas
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk
index 463085b061a..7a1766bed8b 100644
--- a/security/seahorse/buildlink3.mk
+++ b/security/seahorse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/03/14 15:00:57 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:44 reed Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.10.
 # XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nseahorse}
 BUILDLINK_PACKAGES+=	seahorse
 
 .if !empty(SEAHORSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.seahorse+=	seahorse>=0.8.1
+BUILDLINK_API_DEPENDS.seahorse+=	seahorse>=0.8.1
 BUILDLINK_PKGSRCDIR.seahorse?=	../../security/seahorse
 .endif	# SEAHORSE_BUILDLINK3_MK
 
diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk
index 66a403b5540..c7f1ca57834 100644
--- a/security/skey/buildlink3.mk
+++ b/security/skey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SKEY_BUILDLINK3_MK:=	${SKEY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nskey}
 BUILDLINK_PACKAGES+=	skey
 
 .if !empty(SKEY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.skey+=	skey>=1.1.5
-BUILDLINK_RECOMMENDED.skey?=	skey>=1.1.5nb2
+BUILDLINK_API_DEPENDS.skey+=	skey>=1.1.5
+BUILDLINK_ABI_DEPENDS.skey?=	skey>=1.1.5nb2
 BUILDLINK_PKGSRCDIR.skey?=	../../security/skey
 BUILDLINK_DEPMETHOD.skey?=	build
 .endif	# SKEY_BUILDLINK3_MK
diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk
index 6f79b3f79d4..9c6a0c09455 100644
--- a/security/skey/builtin.mk
+++ b/security/skey/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
 
 BUILTIN_PKG:=	skey
 
@@ -45,7 +45,7 @@ USE_BUILTIN.skey=	${IS_BUILTIN.skey}
 .    if defined(BUILTIN_PKG.skey) && \
         !empty(IS_BUILTIN.skey:M[yY][eE][sS])
 USE_BUILTIN.skey=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.skey}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.skey}
 .        if !empty(USE_BUILTIN.skey:M[yY][eE][sS])
 USE_BUILTIN.skey!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.skey:Q}; then	\
diff --git a/security/tcl-tls/buildlink3.mk b/security/tcl-tls/buildlink3.mk
index db79717630c..c4f30e9b95e 100644
--- a/security/tcl-tls/buildlink3.mk
+++ b/security/tcl-tls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/22 19:45:23 peter Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_TLS_BUILDLINK3_MK:=	${TCL_TLS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tls}
 BUILDLINK_PACKAGES+=	tcl-tls
 
 .if !empty(TCL_TLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tls+=	tcl-tls>=1.5.0
+BUILDLINK_API_DEPENDS.tcl-tls+=	tcl-tls>=1.5.0
 BUILDLINK_PKGSRCDIR.tcl-tls?=	../../security/tcl-tls
 .endif	# TCL_TLS_BUILDLINK3_MK
 
diff --git a/security/tcp_wrappers/buildlink3.mk b/security/tcp_wrappers/buildlink3.mk
index d948416e373..e1cb7e765dc 100644
--- a/security/tcp_wrappers/buildlink3.mk
+++ b/security/tcp_wrappers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/10/18 04:32:01 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCP_WRAPPERS_BUILDLINK3_MK:=	${TCP_WRAPPERS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcp_wrappers}
 BUILDLINK_PACKAGES+=	tcp_wrappers
 
 .if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
-BUILDLINK_RECOMMENDED.tcp_wrappers+=	tcp_wrappers>=7.6.1nb3
+BUILDLINK_API_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
+BUILDLINK_ABI_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb3
 BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 .endif	# TCP_WRAPPERS_BUILDLINK3_MK
 
diff --git a/security/tcp_wrappers/builtin.mk b/security/tcp_wrappers/builtin.mk
index 8537f44cf01..840f8eab14b 100644
--- a/security/tcp_wrappers/builtin.mk
+++ b/security/tcp_wrappers/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
 
 BUILTIN_PKG:=	tcp_wrappers
 
@@ -34,7 +34,7 @@ USE_BUILTIN.tcp_wrappers=	${IS_BUILTIN.tcp_wrappers}
 .    if defined(BUILTIN_PKG.tcp_wrappers) && \
         !empty(IS_BUILTIN.tcp_wrappers:M[yY][eE][sS])
 USE_BUILTIN.tcp_wrappers=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.tcp_wrappers}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.tcp_wrappers}
 .        if !empty(USE_BUILTIN.tcp_wrappers:M[yY][eE][sS])
 USE_BUILTIN.tcp_wrappers!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 423620009dc..aa5577e8cf0 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:44 reed Exp $
 
 DISTNAME=	tinyca-0.6.8
 PKGREVISION=	2
@@ -21,7 +21,7 @@ CADIR=		${PREFIX}/share/tinyca
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	tinyca
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7d
 
 SUBST_CLASSES+=		script
 SUBST_STAGE.script=	post-patch