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

28 files changed, 71 insertions, 71 deletions

diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk
index a322722cc00..d0728a19265 100644
--- a/mail/Pantomime/buildlink3.mk
+++ b/mail/Pantomime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/12 14:38:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PANTOMIME_BUILDLINK3_MK:=	${PANTOMIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NPantomime}
 BUILDLINK_PACKAGES+=	Pantomime
 
 .if !empty(PANTOMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Pantomime+=	Pantomime>=1.1.2
-BUILDLINK_RECOMMENDED.Pantomime+=	Pantomime>=1.1.2nb3
+BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>=1.1.2
+BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.1.2nb3
 BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime
 
 .include "../../devel/gnustep-make/gnustep.mk"
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 665fab8109d..71313e6190c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/04/02 09:49:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:22:15 reed Exp $
 
 DISTNAME=	balsa-2.3.10
 PKGREVISION=	3
@@ -38,7 +38,7 @@ BUILDLINK_TRANSFORM+=		rm:-DGNOME_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGNOME_VFS_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index becb3a6ec11..124fafed091 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2006/04/06 06:22:16 reed Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -76,7 +76,7 @@ PLIST_SUBST+=		MILTER="@comment "
 .if !empty(PKG_OPTIONS:Mcurl)
 .  include "../../www/curl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libcurl
-BUILDLINK_DEPENDS.curl+=curl>=7.10.0
+BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
 .else
 CONFIGURE_ARGS+=	--without-libcurl
 .endif
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 5f6a54036b6..c2fd29a412b 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:16 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclamav}
 BUILDLINK_PACKAGES+=	clamav
 
 .if !empty(CLAMAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clamav+=	clamav>=0.60nb1
-BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.88nb1
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.60nb1
+BUILDLINK_ABI_DEPENDS.clamav+=	clamav>=0.88nb1
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 32511525fd1..ac7ff2e99b4 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/22 22:50:32 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:16 reed Exp $
 
 DISTNAME=	dk-milter-0.3.0
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	tv@NetBSD.org
 HOMEPAGE=	http://sendmail.net/dk-milter/
 COMMENT=	Open source implementation of DomainKeys for sendmail
 
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 
 LICENSE=		no-profit
 MAKE_ENV+=		M4=${M4:Q}
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 232dbc9851b..3f6c4dfa327 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/01/08 18:20:30 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:22:16 reed Exp $
 
 DISTNAME=	dkim-milter-0.1.1
 CATEGORIES=	mail
@@ -8,7 +8,7 @@ MAINTAINER=	imil@gcu.info
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 COMMENT=	Open source DKIM filter software from Sendmail, Inc
 
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 
 LICENSE=		no-profit
 MAKE_ENV+=		M4=${M4:Q}
diff --git a/mail/drac/buildlink3.mk b/mail/drac/buildlink3.mk
index f90f96c5b7f..51db9e7a8d6 100644
--- a/mail/drac/buildlink3.mk
+++ b/mail/drac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/25 01:06:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:16 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DRAC_BUILDLINK3_MK:=	${DRAC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndrac}
 BUILDLINK_PACKAGES+=	drac
 
 .if !empty(DRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.drac+=	drac>=1.10
+BUILDLINK_API_DEPENDS.drac+=	drac>=1.10
 BUILDLINK_PKGSRCDIR.drac?=	../../mail/drac
 BUILDLINK_DEPMETHOD.drac?=	build
 .endif	# DRAC_BUILDLINK3_MK
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 2863336679c..9033491227b 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/30 21:15:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/06 06:22:17 reed Exp $
 #
 
 DISTNAME=	evolution-data-server-1.6.0
@@ -13,7 +13,7 @@ COMMENT=	Evolution data server
 BUILD_USES_MSGFMT=	yes
 USE_MSGFMT_PLURALS=	yes
 
-BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 26b148bb72d..f802b31c1ce 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=	${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution-data-server}
 BUILDLINK_PACKAGES+=	evolution-data-server
 
 .if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.2.1nb1
-BUILDLINK_RECOMMENDED.evolution-data-server?=	evolution-data-server>=1.4.2.1nb3
+BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.2.1nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server?=	evolution-data-server>=1.4.2.1nb3
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 .endif	# EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 12105387d59..35a861b52ea 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2006/04/01 16:13:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.106 2006/04/06 06:22:16 reed Exp $
 
 DISTNAME=		evolution-2.6.0
 PKGREVISION=		2
@@ -82,7 +82,7 @@ PRINT_PLIST_AWK+=	/smime/ { print "$${HAVE_SMIME}" $$0; next; }
 # add rpath flags to the dependency_libs, but there is an strange comment
 # in the wrapper saying that it shouldn't.
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
-BUILDLINK_DEPENDS.nss+=		nss>=3.9.2nb3
+BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb3
 .  include "../../devel/nspr/buildlink3.mk"
 .  include "../../devel/nss/buildlink3.mk"
 
@@ -108,9 +108,9 @@ GCONF2_SCHEMAS+=	evolution-mail-2.6.schemas
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.1
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
-BUILDLINK_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb2
+BUILDLINK_API_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.3
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index 53a05c53c66..fea01c48bf9 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/03/30 21:37:01 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:17 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 EVOLUTION_BUILDLINK3_MK:=	${EVOLUTION_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution}
 BUILDLINK_PACKAGES+=	evolution
 
 .if !empty(EVOLUTION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution+=	evolution>=2.6.0
+BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.6.0
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 .endif	# EVOLUTION_BUILDLINK3_MK
 
diff --git a/mail/faces/buildlink3.mk b/mail/faces/buildlink3.mk
index 3854751db34..deb9c245616 100644
--- a/mail/faces/buildlink3.mk
+++ b/mail/faces/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FACES_BUILDLINK3_MK:=	${FACES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaces}
 BUILDLINK_PACKAGES+=	faces
 
 .if !empty(FACES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faces+=	faces>=1.6.1nb1
-BUILDLINK_RECOMMENDED.faces+=	faces>=1.6.1nb4
+BUILDLINK_API_DEPENDS.faces+=	faces>=1.6.1nb1
+BUILDLINK_ABI_DEPENDS.faces+=	faces>=1.6.1nb4
 BUILDLINK_PKGSRCDIR.faces?=	../../mail/faces
 .endif	# FACES_BUILDLINK3_MK
 
diff --git a/mail/gmime/buildlink3.mk b/mail/gmime/buildlink3.mk
index 8ed2d5dacca..1696880468e 100644
--- a/mail/gmime/buildlink3.mk
+++ b/mail/gmime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMIME_BUILDLINK3_MK:=	${GMIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngmime}
 BUILDLINK_PACKAGES+=	gmime
 
 .if !empty(GMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.7
-BUILDLINK_RECOMMENDED.gmime+=	gmime>=2.1.9nb1
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
+BUILDLINK_ABI_DEPENDS.gmime+=	gmime>=2.1.9nb1
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
 .endif	# GMIME_BUILDLINK3_MK
 
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 1a635c4c40a..b11802891bd 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:18 reed Exp $
 
 DISTNAME=	imap-utils
 PKGNAME=	imap-uw-utils-20050108
@@ -12,7 +12,7 @@ COMMENT=	UW IMAP mailbox utilities
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
 
 SRCDIRS=	icat ifrom
 
diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk
index 0b7e6e4ffa2..fbbcfd0c433 100644
--- a/mail/imap-uw/buildlink3.mk
+++ b/mail/imap-uw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/10/05 15:49:44 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMAP_UW_BUILDLINK3_MK:=	${IMAP_UW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nimap-uw}
 BUILDLINK_PACKAGES+=	imap-uw
 
 .if !empty(IMAP_UW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004
-BUILDLINK_RECOMMENDED.imap-uw+=	imap-uw>=2004enb1
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004
+BUILDLINK_ABI_DEPENDS.imap-uw+=	imap-uw>=2004enb1
 BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
 #
 # Make "-limapuw" resolve into "-lc-client".
diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk
index 45a8bc1b3cb..5ef14ccaec9 100644
--- a/mail/libesmtp/buildlink3.mk
+++ b/mail/libesmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBESMTP_BUILDLINK3_MK:=	${LIBESMTP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibesmtp}
 BUILDLINK_PACKAGES+=	libesmtp
 
 .if !empty(LIBESMTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libesmtp+=	libesmtp>=1.0rc1nb1
-BUILDLINK_RECOMMENDED.libesmtp?=	libesmtp>=1.0.3nb2
+BUILDLINK_API_DEPENDS.libesmtp+=	libesmtp>=1.0rc1nb1
+BUILDLINK_ABI_DEPENDS.libesmtp?=	libesmtp>=1.0.3nb2
 BUILDLINK_PKGSRCDIR.libesmtp?=	../../mail/libesmtp
 
 LIBESMTP=	-lesmtp
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 9a16e45ebe3..1ab3904b768 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/08 06:33:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibetpan}
 BUILDLINK_PACKAGES+=	libetpan
 
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetpan+=	libetpan>=0.38nb1
-BUILDLINK_RECOMMENDED.libetpan?=	libetpan>=0.43
+BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.38nb1
+BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.43
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk
index a0edff9607e..a28cf38f9bb 100644
--- a/mail/libmilter/buildlink3.mk
+++ b/mail/libmilter/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/08/30 20:26:18 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMILTER_BUILDLINK3_MK:=	${LIBMILTER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmilter}
 BUILDLINK_PACKAGES+=	libmilter
 
 .if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.1
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.1
 BUILDLINK_PKGSRCDIR.libmilter?=	../../mail/libmilter
 BUILDLINK_DEPMETHOD.libmilter?=	build
 
diff --git a/mail/libmilter/builtin.mk b/mail/libmilter/builtin.mk
index c88d7f68818..a7553209741 100644
--- a/mail/libmilter/builtin.mk
+++ b/mail/libmilter/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
 
 BUILTIN_PKG:=	libmilter
 
@@ -34,7 +34,7 @@ USE_BUILTIN.libmilter=	${IS_BUILTIN.libmilter}
 .    if defined(BUILTIN_PKG.libmilter) && \
         !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
 .        if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
diff --git a/mail/libmilter812/buildlink3.mk b/mail/libmilter812/buildlink3.mk
index 133d3e3f3f1..6d55fddde59 100644
--- a/mail/libmilter812/buildlink3.mk
+++ b/mail/libmilter812/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/08/30 20:53:20 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMILTER_BUILDLINK3_MK:=	${LIBMILTER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmilter}
 BUILDLINK_PACKAGES+=	libmilter
 
 .if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.12.9nb1
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.12.9nb1
 BUILDLINK_PKGSRCDIR.libmilter?=	../../mail/libmilter812
 BUILDLINK_DEPMETHOD.libmilter?=	build
 
diff --git a/mail/libmilter812/builtin.mk b/mail/libmilter812/builtin.mk
index a15ac0e408e..2a3d6e239eb 100644
--- a/mail/libmilter812/builtin.mk
+++ b/mail/libmilter812/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:18 reed Exp $
 
 BUILTIN_PKG:=	libmilter
 
@@ -34,7 +34,7 @@ USE_BUILTIN.libmilter=	${IS_BUILTIN.libmilter}
 .    if defined(BUILTIN_PKG.libmilter) && \
         !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
 .        if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile
index e8fa66b89bb..bb745b5a084 100644
--- a/mail/libspf-alt/Makefile
+++ b/mail/libspf-alt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:18 reed Exp $
 
 DISTNAME=	libspf_alt-0.4.0
 PKGREVISION=	3
@@ -9,7 +9,7 @@ MAINTAINER=	manu@NetBSD.org
 HOMEPAGE=	http://www.midwestcs.com/spf/libspf-alt/
 COMMENT=	Sender Permitted Framework (SPF) library
 
-BUILDLINK_DEPENDS.bind+=	bind>=9.2.3nb3
+BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.3nb3
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind}
diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk
index 07bcd12fc1a..fdb7b63f076 100644
--- a/mail/libspf-alt/buildlink3.mk
+++ b/mail/libspf-alt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:18 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSPF_ALT_BUILDLINK3_MK:=	${LIBSPF_ALT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibspf_alt}
 BUILDLINK_PACKAGES+=	libspf_alt
 
 .if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
-BUILDLINK_RECOMMENDED.libspf_alt+=	libspf_alt>=0.4.0nb3
+BUILDLINK_API_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.libspf_alt?=	../../mail/libspf-alt
 .endif	# LIBSPF_ALT_BUILDLINK3_MK
 
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 8d6f2459217..3e73c2036fa 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:19 reed Exp $
 
 DISTNAME=	Mail-ClamAV-0.17
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Perl5 module for mail/clamav virus scanner
 DEPENDS+=	p5-Inline>=0.40:../../devel/p5-Inline
 
 # this version needs clamav>=0.80
-BUILDLINK_DEPENDS.clamav+=	clamav>=0.80
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.80
 
 PERL5_PACKLIST=		auto/Mail/ClamAV/.packlist
 PTHREAD_OPTS+=		require
diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk
index 1743730b770..01273a4b832 100644
--- a/mail/perdition/buildlink3.mk
+++ b/mail/perdition/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:19 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PERDITION_BUILDLINK3_MK:=	${PERDITION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nperdition}
 BUILDLINK_PACKAGES+=	perdition
 
 .if !empty(PERDITION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.perdition+=	perdition>=1.17
-BUILDLINK_RECOMMENDED.perdition?=	perdition>=1.17nb1
+BUILDLINK_API_DEPENDS.perdition+=	perdition>=1.17
+BUILDLINK_ABI_DEPENDS.perdition?=	perdition>=1.17nb1
 BUILDLINK_PKGSRCDIR.perdition?=	../../mail/perdition
 .endif	# PERDITION_BUILDLINK3_MK
 
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index ff2300028ae..68ffac5633e 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/03/04 21:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/06 06:22:19 reed Exp $
 
 DISTNAME=	pine4.64
 PKGNAME=	pine-4.64
@@ -104,7 +104,7 @@ do-install:
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
 # 2004e contains extensions needed by Pine 4.63
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004e
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004e
 .include "../../mail/imap-uw/buildlink3.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 156d5f8a9f8..ff32e511a71 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/27 07:12:13 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:19 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsquirrelmail}
 BUILDLINK_PACKAGES+=	squirrelmail
 
 .if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.squirrelmail+=	{ja-,}squirrelmail>=1.4.6
-BUILDLINK_RECOMMENDED.squirrelmail?=	squirrelmail>=1.4.6
+BUILDLINK_API_DEPENDS.squirrelmail+=	{ja-,}squirrelmail>=1.4.6
+BUILDLINK_ABI_DEPENDS.squirrelmail?=	squirrelmail>=1.4.6
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
diff --git a/mail/sylpheed-claws/buildlink3.mk b/mail/sylpheed-claws/buildlink3.mk
index 278ed41bfa9..9dcaff955f1 100644
--- a/mail/sylpheed-claws/buildlink3.mk
+++ b/mail/sylpheed-claws/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:19 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SYLPHEED_CLAWS_BUILDLINK3_MK:=	${SYLPHEED_CLAWS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsylpheed-claws}
 BUILDLINK_PACKAGES+=	sylpheed-claws
 
 .if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sylpheed-claws+=	sylpheed-claws>=0.9.7nb1
-BUILDLINK_RECOMMENDED.sylpheed-claws?=	sylpheed-claws>=1.0.4nb1
+BUILDLINK_API_DEPENDS.sylpheed-claws+=	sylpheed-claws>=0.9.7nb1
+BUILDLINK_ABI_DEPENDS.sylpheed-claws?=	sylpheed-claws>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.sylpheed-claws?=	../../mail/sylpheed-claws
 .endif	# SYLPHEED_CLAWS_BUILDLINK3_MK