Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

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

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

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

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

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

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

As discussed on tech-pkg.

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

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

46 files changed, 125 insertions, 125 deletions

diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index 1da2cf5d6f0..159dfe95072 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:44 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
 BUILDLINK_PACKAGES+=	amanda-common
 
 .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb2
-BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p4nb3
+BUILDLINK_API_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb2
+BUILDLINK_ABI_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb3
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
 .endif	# AMANDA_COMMON_BUILDLINK3_MK
 
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index 0578cc53bb9..1744ec5ac90 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DBUS_GLIB_BUILDLINK3_MK:=	${DBUS_GLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus-glib}
 BUILDLINK_PACKAGES+=	dbus-glib
 
 .if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus-glib+=	dbus-glib>=0.61
+BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.61
 BUILDLINK_PKGSRCDIR.dbus-glib?=	../../sysutils/dbus-glib
 .endif	# DBUS_GLIB_BUILDLINK3_MK
 
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 3ac7a09c2a7..a7ebfb44e4c 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/04/06 06:22:45 reed Exp $
 #
 
 DBUS_VERSION=	0.61
@@ -75,7 +75,7 @@ INSTALL_DIRS+=		${WRKSRC}/${f}
 SUBST_FILES.paths+=	${f}/Makefile.in
 .  endfor
 
-BUILDLINK_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
 .  include "../../sysutils/dbus/buildlink3.mk"
 .endif
 
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index 1e46e7546e9..314c185c17f 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/30 20:57:08 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBUS_BUILDLINK3_MK:=	${DBUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndbus}
 BUILDLINK_PACKAGES+=	dbus
 
 .if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+=	dbus>=0.61
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=0.61
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/dbus-1\/services/ \
diff --git a/sysutils/desktop-file-utils/buildlink3.mk b/sysutils/desktop-file-utils/buildlink3.mk
index 3184deb620f..ffa490cec1a 100644
--- a/sysutils/desktop-file-utils/buildlink3.mk
+++ b/sysutils/desktop-file-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 DESKTOP_FILE_UTILS_BUILDLINK3_MK:=	${DESKTOP_FILE_UTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndesktop-file-utils}
 BUILDLINK_PACKAGES+=	desktop-file-utils
 
 .if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.8
-BUILDLINK_RECOMMENDED.desktop-file-utils+=	desktop-file-utils>=0.10nb1
+BUILDLINK_API_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.8
+BUILDLINK_ABI_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.10nb1
 BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils
 .endif	# DESKTOP_FILE_UTILS_BUILDLINK3_MK
 
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 65c17943d91..73e4b6ad01f 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:40 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:45 reed Exp $
 #
 
 DISTNAME=		duplicity-0.4.1
@@ -12,7 +12,7 @@ COMMENT=		Remote encrypting incremental backup utility
 
 DEPENDS+=		gnupg>=1.2.3:../../security/gnupg
 
-BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONS_ACCEPTED= 22 23
 
diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk
index aa8d6588ca6..e1ddb68134b 100644
--- a/sysutils/fam/buildlink3.mk
+++ b/sysutils/fam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAM_BUILDLINK3_MK:=	${FAM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfam}
 BUILDLINK_PACKAGES+=	fam
 
 .if !empty(FAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fam+=		fam>=2.6.10
-BUILDLINK_RECOMMENDED.fam+=	fam>=2.7.0nb7
+BUILDLINK_API_DEPENDS.fam+=		fam>=2.6.10
+BUILDLINK_ABI_DEPENDS.fam+=	fam>=2.7.0nb7
 BUILDLINK_PKGSRCDIR.fam?=	../../sysutils/fam
 .endif	# FAM_BUILDLINK3_MK
 
diff --git a/sysutils/fam/builtin.mk b/sysutils/fam/builtin.mk
index 9585aed69f6..74e166ca43a 100644
--- a/sysutils/fam/builtin.mk
+++ b/sysutils/fam/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:45 reed Exp $
 
 BUILTIN_PKG:=	fam
 
@@ -31,7 +31,7 @@ USE_BUILTIN.fam=	${IS_BUILTIN.fam}
 .    if defined(BUILTIN_PKG.fam) && \
         !empty(IS_BUILTIN.fam:M[yY][eE][sS])
 USE_BUILTIN.fam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.fam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.fam}
 .        if !empty(USE_BUILTIN.fam:M[yY][eE][sS])
 USE_BUILTIN.fam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fam:Q}; then	\
diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk
index 24125f28322..99d6a1e37d7 100644
--- a/sysutils/file/buildlink3.mk
+++ b/sysutils/file/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfile}
 BUILDLINK_PACKAGES+=	file
 
 .if !empty(FILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.file+=	file>=4.09
-BUILDLINK_RECOMMENDED.file+=	file>=4.09nb1
+BUILDLINK_API_DEPENDS.file+=	file>=4.09
+BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
 BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
 .endif	# FILE_BUILDLINK3_MK
 
diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk
index bcf7e0ce9c5..05376c51790 100644
--- a/sysutils/file/builtin.mk
+++ b/sysutils/file/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:45 reed Exp $
 
 BUILTIN_PKG:=	file
 
@@ -32,7 +32,7 @@ USE_BUILTIN.file=	${IS_BUILTIN.file}
 .    if defined(BUILTIN_PKG.file) && \
         !empty(IS_BUILTIN.file:M[yY][eE][sS])
 USE_BUILTIN.file=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.file}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.file}
 .        if !empty(USE_BUILTIN.file:M[yY][eE][sS])
 USE_BUILTIN.file!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.file:Q}; then	\
diff --git a/sysutils/gamin/buildlink3.mk b/sysutils/gamin/buildlink3.mk
index 13bfe92bd98..b95e73b6f0d 100644
--- a/sysutils/gamin/buildlink3.mk
+++ b/sysutils/gamin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAMIN_BUILDLINK3_MK:=	${GAMIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngamin}
 BUILDLINK_PACKAGES+=	gamin
 
 .if !empty(GAMIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gamin+=	gamin>=0.1.5
-BUILDLINK_RECOMMENDED.gamin?=	gamin>=0.1.5nb2
+BUILDLINK_API_DEPENDS.gamin+=	gamin>=0.1.5
+BUILDLINK_ABI_DEPENDS.gamin?=	gamin>=0.1.5nb2
 BUILDLINK_PKGSRCDIR.gamin?=	../../sysutils/gamin
 .endif	# GAMIN_BUILDLINK3_MK
 
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 4ede36fcee6..1e880753c63 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngkrellm}
 BUILDLINK_PACKAGES+=	gkrellm
 
 .if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm>=2.1.22
-BUILDLINK_RECOMMENDED.gkrellm?=	gkrellm>=2.2.7nb2
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.1.22
+BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=2.2.7nb2
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm
 .endif	# GKRELLM_BUILDLINK3_MK
 
diff --git a/sysutils/gkrellm1/buildlink3.mk b/sysutils/gkrellm1/buildlink3.mk
index 0bac9d9a83a..af94411f0fc 100644
--- a/sysutils/gkrellm1/buildlink3.mk
+++ b/sysutils/gkrellm1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GKRELLM_BUILDLINK3_MK:=	${GKRELLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngkrellm}
 BUILDLINK_PACKAGES+=	gkrellm
 
 .if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm<2.0
-BUILDLINK_RECOMMENDED.gkrellm?=	gkrellm>=1.2.13nb5
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm<2.0
+BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=1.2.13nb5
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm1
 .endif	# GKRELLM_BUILDLINK3_MK
 
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 36ebdbcbedf..eb2a730799f 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/04/06 06:22:45 reed Exp $
 #
 
 DISTNAME=	gnome-menus-2.13.5
@@ -38,8 +38,8 @@ SUBST_FILES.paths=	layout/*.menu
 SUBST_SED.paths=	-e 's|/usr/|${PREFIX}/|g'
 SUBST_SED.paths+=	-e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g'
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index 7e7b89380a5..af806e0239e 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/30 21:11:51 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-menus}
 BUILDLINK_PACKAGES+=	gnome-menus
 
 .if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.13.5
+BUILDLINK_API_DEPENDS.gnome-menus+=		gnome-menus>=2.13.5
 BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 070c0d6cbe4..c3d7ac3a2c3 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/02/05 23:10:51 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:22:45 reed Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		10
@@ -11,7 +11,7 @@ COMMENT=		GNOME Virtual File System
 
 BROKEN_GETTEXT_DETECTION=	yes
 BUILD_USES_MSGFMT=	YES
-BUILDLINK_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
+BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
 
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index ca2633590c2..d21cf08f2a2 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs}
 BUILDLINK_PACKAGES+=	gnome-vfs
 
 .if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb7
-BUILDLINK_RECOMMENDED.gnome-vfs+=	gnome-vfs>=1.0.5nb10
+BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb7
+BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=1.0.5nb10
 BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
 .endif	# GNOME_VFS_BUILDLINK3_MK
 
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index e425086a597..8a8e47f1767 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/04/02 18:58:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2006/04/06 06:22:45 reed Exp $
 
 PKGREVISION=		1
 
@@ -18,7 +18,7 @@ GCONF2_SCHEMAS+=	system_smb.schemas
 
 LDFLAGS.Darwin+=	-lresolv
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.9.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.3
 
 .include "Makefile.common"
 
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 7c43f808ead..48277016b62 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile.common,v 1.32 2006/04/06 06:22:45 reed Exp $
 #
 
 GNOME_VFS2_VERSION=	2.14.0
@@ -87,7 +87,7 @@ SUBST_STAGE.libs=       pre-configure
 SUBST_FILES.libs=       modules/Makefile.in
 SUBST_SED.libs=         -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=${GNOME_VFS2_VERSION}
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=${GNOME_VFS2_VERSION}
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk
index 043b2b3226d..4d269f8e8f1 100644
--- a/sysutils/gnome-vfs2/buildlink3.mk
+++ b/sysutils/gnome-vfs2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/04/02 18:58:20 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFS2_BUILDLINK3_MK:=	${GNOME_VFS2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs2}
 BUILDLINK_PACKAGES+=	gnome-vfs2
 
 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-vfs2+=	gnome-vfs2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 7f51df3e385..b03ff673968 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFSMM_BUILDLINK3_MK:=	${GNOME_VFSMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfsmm}
 BUILDLINK_PACKAGES+=	gnome-vfsmm
 
 .if !empty(GNOME_VFSMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
-BUILDLINK_RECOMMENDED.gnome-vfsmm?=	gnome-vfsmm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gnome-vfsmm?=	gnome-vfsmm>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.gnome-vfsmm?=	../../sysutils/gnome-vfsmm
 .endif	# GNOME_VFSMM_BUILDLINK3_MK
 
diff --git a/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk b/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
index 8308291e113..aa0f308560c 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
+++ b/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK:=	${GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-gnomevfs}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-gnomevfs
 
 .if !empty(GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-gnomevfs+=	gst-plugins0.8-gnomevfs>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-gnomevfs?=	gst-plugins0.8-gnomevfs>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-gnomevfs+=	gst-plugins0.8-gnomevfs>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-gnomevfs?=	gst-plugins0.8-gnomevfs>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-gnomevfs?=	../../sysutils/gst-plugins0.8-gnomevfs
 .endif	# GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK
 
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index a2451389fdf..9447ce611bb 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/30 21:09:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:45 reed Exp $
 
 DISTNAME=		libgtop-2.14.0
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -92,7 +92,7 @@ CPPFLAGS+=	-DHAVE_STATVFS_WRITES_COUNT
 .endif
 .undef statvfs_h
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/libgtop2/buildlink3.mk b/sysutils/libgtop2/buildlink3.mk
index 2cf5943e760..a06732544f2 100644
--- a/sysutils/libgtop2/buildlink3.mk
+++ b/sysutils/libgtop2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/30 21:09:48 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTOP2_BUILDLINK3_MK:=	${LIBGTOP2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop2}
 BUILDLINK_PACKAGES+=	libgtop2
 
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.14.0
+BUILDLINK_API_DEPENDS.libgtop2+=	libgtop2>=2.14.0
 BUILDLINK_PKGSRCDIR.libgtop2?=	../../sysutils/libgtop2
 .endif	# LIBGTOP2_BUILDLINK3_MK
 
diff --git a/sysutils/libol/buildlink3.mk b/sysutils/libol/buildlink3.mk
index 935396986fb..6fcf0b33568 100644
--- a/sysutils/libol/buildlink3.mk
+++ b/sysutils/libol/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/06 18:31:23 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOL_BUILDLINK3_MK:=	${LIBOL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibol}
 BUILDLINK_PACKAGES+=	libol
 
 .if !empty(LIBOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libol+=	libol>=0.3.17
+BUILDLINK_API_DEPENDS.libol+=	libol>=0.3.17
 BUILDLINK_PKGSRCDIR.libol?=	../../sysutils/libol
 .endif	# LIBOL_BUILDLINK3_MK
 
diff --git a/sysutils/medusa/buildlink3.mk b/sysutils/medusa/buildlink3.mk
index 7fe02d2c25e..06aa2f7c853 100644
--- a/sysutils/medusa/buildlink3.mk
+++ b/sysutils/medusa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:45 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MEDUSA_BUILDLINK3_MK:=	${MEDUSA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmedusa}
 BUILDLINK_PACKAGES+=	medusa
 
 .if !empty(MEDUSA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.medusa+=	medusa>=0.5.1nb7
-BUILDLINK_RECOMMENDED.medusa?=	medusa>=0.5.1nb9
+BUILDLINK_API_DEPENDS.medusa+=	medusa>=0.5.1nb7
+BUILDLINK_ABI_DEPENDS.medusa?=	medusa>=0.5.1nb9
 BUILDLINK_PKGSRCDIR.medusa?=	../../sysutils/medusa
 .endif	# MEDUSA_BUILDLINK3_MK
 
diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk
index aefcd71a6d1..b5a13b71b4e 100644
--- a/sysutils/nautilus-cd-burner/buildlink3.mk
+++ b/sysutils/nautilus-cd-burner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 NAUTILUS_CD_BURNER_BUILDLINK3_MK:=	${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus-cd-burner}
 BUILDLINK_PACKAGES+=	nautilus-cd-burner
 
 .if !empty(NAUTILUS_CD_BURNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus-cd-burner?=	nautilus-cd-burner>=2.12.3
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus-cd-burner?=	nautilus-cd-burner>=2.12.3
 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?=	../../sysutils/nautilus-cd-burner
 .endif	# NAUTILUS_CD_BURNER_BUILDLINK3_MK
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 4d4d0b9be62..76a5b58f758 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/03/30 21:12:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.65 2006/04/06 06:22:46 reed Exp $
 #
 
 DISTNAME=		nautilus-2.14.0
@@ -24,10 +24,10 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 
-BUILDLINK_DEPENDS.eel2+=	eel2>=2.13.91
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.13.92
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
+BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.13.91
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.13.92
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 235e0a130f8..3a52c43c250 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnautilus}
 BUILDLINK_PACKAGES+=	nautilus
 
 .if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus?=	nautilus>=2.12.2nb2
+BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus?=	nautilus>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus$$/ \
diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk
index 7380ea95b85..56de1e17680 100644
--- a/sysutils/pciutils/buildlink3.mk
+++ b/sysutils/pciutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PCIUTILS_BUILDLINK3_MK:=	${PCIUTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npciutils}
 BUILDLINK_PACKAGES+=	pciutils
 
 .if !empty(PCIUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pciutils+=	pciutils>=2.1.11
-BUILDLINK_RECOMMENDED.pciutils?=	pciutils>=2.1.11nb1
+BUILDLINK_API_DEPENDS.pciutils+=	pciutils>=2.1.11
+BUILDLINK_ABI_DEPENDS.pciutils?=	pciutils>=2.1.11nb1
 BUILDLINK_PKGSRCDIR.pciutils?=	../../sysutils/pciutils
 BUILDLINK_DEPMETHOD.pciutils?=	build
 .endif	# PCIUTILS_BUILDLINK3_MK
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index 9106ac740ec..855877512e7 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/02 15:04:20 rxg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_DBUS_BUILDLINK3_MK:=		${PY_DBUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-dbus}
 BUILDLINK_PACKAGES+=	py-dbus
 
 .if !empty(PY_DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
-BUILDLINK_RECOMMENDED.py-dbus?=	${PYPKGPREFIX}-dbus>=0.23.4nb2
+BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
+BUILDLINK_ABI_DEPENDS.py-dbus?=	${PYPKGPREFIX}-dbus>=0.23.4nb2
 BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
 .endif	# PY_DBUS_BUILDLINK3_MK
 
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index cd397ad5d27..779de7db085 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:46 reed Exp $
 #
 
 DISTNAME=	rdiff-backup-1.0.1
@@ -19,7 +19,7 @@ SUBST_FILES.path=	setup.py
 SUBST_SED.path=		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 SUBST_MESSAGE.path=	"Fixing paths."
 
-BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 
 .include "../../devel/librsync/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index eb014b44952..9d44dabf153 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/03/31 23:56:30 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:46 reed Exp $
 #
 
 DISTNAME=	vcdimager-0.7.23
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in
 BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver
 .endif
 
-BUILDLINK_DEPENDS.libcdio+=	libcdio>=0.72
+BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.72
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk
index 1d8a08750a6..59e5f30548d 100644
--- a/sysutils/vcdimager-devel/buildlink3.mk
+++ b/sysutils/vcdimager-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 VCDIMAGER_BUILDLINK3_MK:=	${VCDIMAGER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvcdimager}
 BUILDLINK_PACKAGES+=	vcdimager
 
 .if !empty(VCDIMAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20
-BUILDLINK_RECOMMENDED.vcdimager+=	vcdimager>=0.7.23nb1
+BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20
+BUILDLINK_ABI_DEPENDS.vcdimager+=	vcdimager>=0.7.23nb1
 BUILDLINK_PKGSRCDIR.vcdimager?=	../../sysutils/vcdimager-devel
 .endif	# VCDIMAGER_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-appfinder/buildlink3.mk b/sysutils/xfce4-appfinder/buildlink3.mk
index 4e6a56df34e..f44619dd7e5 100644
--- a/sysutils/xfce4-appfinder/buildlink3.mk
+++ b/sysutils/xfce4-appfinder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_APPFINDER_BUILDLINK3_MK:=	${XFCE4_APPFINDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-appfinder}
 BUILDLINK_PACKAGES+=	xfce4-appfinder
 
 .if !empty(XFCE4_APPFINDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-appfinder?=	xfce4-appfinder>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-appfinder?=	xfce4-appfinder>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-appfinder?=	../../sysutils/xfce4-appfinder
 .endif	# XFCE4_APPFINDER_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index f7e90696459..e56c8a026ec 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin}
 BUILDLINK_PACKAGES+=	xfce4-cpugraph-plugin
 
 .if !empty(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb1
-BUILDLINK_RECOMMENDED.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.2.2nb3
+BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.2.2nb3
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
 .endif	# XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 832083938f2..b1694b9e8e6 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
 BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
 
 .if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5
-BUILDLINK_RECOMMENDED.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=1.5nb2
+BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5
+BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=1.5nb2
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
 .endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk
index b6d08b5cc97..2938e279cc0 100644
--- a/sysutils/xfce4-fm/buildlink3.mk
+++ b/sysutils/xfce4-fm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_FM_BUILDLINK3_MK:=	${XFCE4_FM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fm}
 BUILDLINK_PACKAGES+=	xfce4-fm
 
 .if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-fm?=	xfce4-fm>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-fm?=	xfce4-fm>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-fm?=	../../sysutils/xfce4-fm
 .endif	# XFCE4_FM_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index 5438fa8436a..2df9cdb1053 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-fsguard-plugin}
 BUILDLINK_PACKAGES+=	xfce4-fsguard-plugin
 
 .if !empty(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1
-BUILDLINK_RECOMMENDED.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.2.1nb2
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1
+BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.2.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
 .endif	# XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink3.mk b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
index fb70a973dd4..f29a37a00b5 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink3.mk
+++ b/sysutils/xfce4-minicmd-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-minicmd-plugin}
 BUILDLINK_PACKAGES+=	xfce4-minicmd-plugin
 
 .if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0
-BUILDLINK_RECOMMENDED.xfce4-minicmd-plugin?=	xfce4-minicmd-plugin>=0.3.0nb2
+BUILDLINK_API_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0
+BUILDLINK_ABI_DEPENDS.xfce4-minicmd-plugin?=	xfce4-minicmd-plugin>=0.3.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=	../../sysutils/xfce4-minicmd-plugin
 .endif	# XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index d6716390259..9339d063640 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-netload-plugin}
 BUILDLINK_PACKAGES+=	xfce4-netload-plugin
 
 .if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.3.3nb3
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.3.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
 .endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index df7ace8874b..ab8c568b2b1 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
 XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=	${XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-quicklauncher-plugin}
 BUILDLINK_PACKAGES+=	xfce4-quicklauncher-plugin
 
 .if !empty(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81
-BUILDLINK_RECOMMENDED.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=0.81nb3
+BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81
+BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=0.81nb3
 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?=	../../sysutils/xfce4-quicklauncher-plugin
 .endif	# XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
index 6250cc586f9..225203e19fb 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
+++ b/sysutils/xfce4-showdesktop-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=				${BUILDLINK_DEPTH}+
 XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-showdesktop-plugin}
 BUILDLINK_PACKAGES+=	xfce4-showdesktop-plugin
 
 .if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0
-BUILDLINK_RECOMMENDED.xfce4-showdesktop-plugin?=	xfce4-showdesktop-plugin>=0.4.0nb2
+BUILDLINK_API_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0
+BUILDLINK_ABI_DEPENDS.xfce4-showdesktop-plugin?=	xfce4-showdesktop-plugin>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=	../../sysutils/xfce4-showdesktop-plugin
 .endif	# XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index f47e85690bc..1f620ce4e9c 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systemload-plugin}
 BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
 
 .if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6
-BUILDLINK_RECOMMENDED.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.3.6nb3
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6
+BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.3.6nb3
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
 .endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-systray/buildlink3.mk b/sysutils/xfce4-systray/buildlink3.mk
index ca7bf17a590..c03888dc954 100644
--- a/sysutils/xfce4-systray/buildlink3.mk
+++ b/sysutils/xfce4-systray/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SYSTRAY_BUILDLINK3_MK:=	${XFCE4_SYSTRAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-systray}
 BUILDLINK_PACKAGES+=	xfce4-systray
 
 .if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-systray?=	xfce4-systray>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-systray?=	xfce4-systray>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-systray?=	../../sysutils/xfce4-systray
 .endif	# XFCE4_SYSTRAY_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index 860d6dc53af..fab275f6de2 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/10 08:25:05 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:46 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xkb-plugin}
 BUILDLINK_PACKAGES+=	xfce4-xkb-plugin
 
 .if !empty(XFCE4_XKB_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.3.3
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.3.3
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
 .endif	# XFCE4_XKB_PLUGIN_BUILDLINK3_MK