From 5abef9be142e900cceace758044a1b2ee493daf3 Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Thu, 6 Apr 2006 06:21:32 +0000
Subject: 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).
---
 x11/XFree86-libs/buildlink3.mk            |  6 +++---
 x11/XFree86-libs/builtin.mk               |  4 ++--
 x11/Xaw-Xpm/buildlink3.mk                 |  6 +++---
 x11/Xaw3d/buildlink3.mk                   |  6 +++---
 x11/Xbae/buildlink3.mk                    |  6 +++---
 x11/Xcomposite/buildlink3.mk              |  6 +++---
 x11/Xcomposite/builtin.mk                 |  4 ++--
 x11/Xfixes/buildlink3.mk                  |  6 +++---
 x11/Xfixes/builtin.mk                     |  4 ++--
 x11/XmHTML/buildlink3.mk                  |  6 +++---
 x11/Xrandr-mixedcase/Makefile             |  6 +++---
 x11/Xrandr-mixedcase/buildlink3.mk        |  6 +++---
 x11/Xrandr-mixedcase/builtin.mk           |  8 ++++----
 x11/Xrender/buildlink3.mk                 |  6 +++---
 x11/Xrender/builtin.mk                    |  8 ++++----
 x11/blt/buildlink3.mk                     |  6 +++---
 x11/compositeext/buildlink3.mk            |  6 +++---
 x11/compositeext/builtin.mk               |  4 ++--
 x11/control-center/buildlink3.mk          |  6 +++---
 x11/devilspie/Makefile                    |  4 ++--
 x11/efltk/buildlink3.mk                   |  6 +++---
 x11/fixesext/buildlink3.mk                |  6 +++---
 x11/fixesext/builtin.mk                   |  4 ++--
 x11/fltk/buildlink3.mk                    |  6 +++---
 x11/fox/buildlink3.mk                     |  6 +++---
 x11/gdm/Makefile                          |  4 ++--
 x11/gnome-desktop/Makefile                |  4 ++--
 x11/gnome-desktop/buildlink3.mk           |  4 ++--
 x11/gnome-libs/buildlink3.mk              |  6 +++---
 x11/gnome-mag/buildlink3.mk               |  6 +++---
 x11/gnome-panel/Makefile                  | 10 +++++-----
 x11/gnome-panel/buildlink3.mk             |  6 +++---
 x11/gnome-session/Makefile                |  6 +++---
 x11/gnome-themes-extras/Makefile          |  4 ++--
 x11/gnome2-applets/Makefile               |  8 ++++----
 x11/gnome2-control-center/Makefile        |  6 +++---
 x11/gnome2-control-center/buildlink3.mk   |  6 +++---
 x11/gnome2-terminal/Makefile              |  4 ++--
 x11/gnopernicus/Makefile                  |  4 ++--
 x11/gnustep-back/buildlink3.mk            |  6 +++---
 x11/gnustep-gui/buildlink3.mk             |  6 +++---
 x11/gnustep-preferences/buildlink3.mk     |  6 +++---
 x11/gtk+extra/buildlink3.mk               |  6 +++---
 x11/gtk/buildlink3.mk                     |  6 +++---
 x11/gtk2+extra/buildlink3.mk              |  6 +++---
 x11/gtk2-engines/Makefile                 |  4 ++--
 x11/gtk2-engines/buildlink3.mk            |  6 +++---
 x11/gtk2/Makefile                         |  8 ++++----
 x11/gtk2/buildlink3.mk                    |  6 +++---
 x11/gtkglarea/buildlink3.mk               |  6 +++---
 x11/gtkglarea2/buildlink3.mk              |  6 +++---
 x11/gtkmm/Makefile                        |  4 ++--
 x11/gtkmm/buildlink3.mk                   |  6 +++---
 x11/gtksourceview/buildlink3.mk           |  6 +++---
 x11/gtoolkit/buildlink3.mk                |  8 ++++----
 x11/kdebase3/Makefile                     |  6 +++---
 x11/kdebase3/buildlink3.mk                |  8 ++++----
 x11/kdelibs3/buildlink3.mk                |  6 +++---
 x11/lablgtk/Makefile                      |  4 ++--
 x11/lablgtk/buildlink3.mk                 |  6 +++---
 x11/lablgtk2/buildlink3.mk                |  6 +++---
 x11/lesstif/buildlink3.mk                 |  6 +++---
 x11/libexo/buildlink3.mk                  |  6 +++---
 x11/libxfce4gui/buildlink3.mk             |  6 +++---
 x11/libxfce4mcs/buildlink3.mk             |  6 +++---
 x11/libxfce4util/buildlink3.mk            |  6 +++---
 x11/libxklavier/buildlink3.mk             |  6 +++---
 x11/libzvt/buildlink3.mk                  |  6 +++---
 x11/mowitz/buildlink3.mk                  |  6 +++---
 x11/neXtaw/buildlink3.mk                  |  6 +++---
 x11/ocaml-graphics/buildlink3.mk          |  6 +++---
 x11/openmotif/buildlink3.mk               |  6 +++---
 x11/paragui/buildlink3.mk                 |  6 +++---
 x11/py-Pmw/buildlink3.mk                  |  6 +++---
 x11/py-Tk/buildlink3.mk                   |  6 +++---
 x11/py-Xlib/buildlink3.mk                 |  6 +++---
 x11/py-gnome2-extras/Makefile             |  4 ++--
 x11/py-gnome2-extras/buildlink3.mk        |  6 +++---
 x11/py-gnome2/Makefile                    | 10 +++++-----
 x11/py-gnome2/buildlink3.mk               |  6 +++---
 x11/py-gtk2/buildlink3.mk                 |  4 ++--
 x11/py-qt2-sip/buildlink3.mk              |  6 +++---
 x11/py-qt2/Makefile                       |  4 ++--
 x11/py-qt3-base/Makefile                  |  4 ++--
 x11/py-qt3-base/buildlink3.mk             |  6 +++---
 x11/py-qt3-modules/buildlink3.mk          |  6 +++---
 x11/py-qt3-sip/buildlink3.mk              |  6 +++---
 x11/py-wxWidgets/buildlink3.mk            |  6 +++---
 x11/pygtk/buildlink3.mk                   |  6 +++---
 x11/qt1/buildlink3.mk                     |  6 +++---
 x11/qt2-designer/buildlink3.mk            |  6 +++---
 x11/qt2-libs/buildlink3.mk                |  6 +++---
 x11/qt3-libs/buildlink3.mk                |  6 +++---
 x11/qt3-qscintilla/buildlink3.mk          |  6 +++---
 x11/qt3-tools/buildlink3.mk               |  6 +++---
 x11/qt4-libs/buildlink3.mk                |  4 ++--
 x11/qt4-tools/buildlink3.mk               |  4 ++--
 x11/randrext/buildlink3.mk                |  6 +++---
 x11/randrext/builtin.mk                   |  6 +++---
 x11/renderext/buildlink3.mk               |  4 ++--
 x11/renderext/builtin.mk                  |  6 +++---
 x11/startup-notification/buildlink3.mk    |  6 +++---
 x11/tk-BWidget/buildlink3.mk              |  6 +++---
 x11/tk/buildlink3.mk                      |  6 +++---
 x11/tk83/buildlink3.mk                    |  6 +++---
 x11/vte/Makefile                          |  4 ++--
 x11/vte/buildlink3.mk                     |  6 +++---
 x11/wxGTK-contrib/buildlink3.mk           |  6 +++---
 x11/wxGTK/buildlink3.mk                   |  6 +++---
 x11/wxGTK24/buildlink3.mk                 |  6 +++---
 x11/xcursor/Makefile                      |  4 ++--
 x11/xcursor/buildlink3.mk                 |  6 +++---
 x11/xcursor/builtin.mk                    |  8 ++++----
 x11/xextensions/buildlink3.mk             |  4 ++--
 x11/xextensions/builtin.mk                |  4 ++--
 x11/xfce4-clipman-plugin/buildlink3.mk    |  6 +++---
 x11/xfce4-desktop/buildlink3.mk           |  6 +++---
 x11/xfce4-gtk2-engine/buildlink3.mk       |  6 +++---
 x11/xfce4-mcs-manager/buildlink3.mk       |  6 +++---
 x11/xfce4-mcs-plugins/buildlink3.mk       |  6 +++---
 x11/xfce4-notes-plugin/buildlink3.mk      |  6 +++---
 x11/xfce4-panel/buildlink3.mk             |  6 +++---
 x11/xfce4-session/buildlink3.mk           |  6 +++---
 x11/xfce4-taskbar-plugin/buildlink3.mk    |  6 +++---
 x11/xfce4-toys/buildlink3.mk              |  6 +++---
 x11/xfce4-trigger-launcher/buildlink3.mk  |  6 +++---
 x11/xfce4-utils/buildlink3.mk             |  6 +++---
 x11/xfce4-windowlist-plugin/buildlink3.mk |  6 +++---
 x11/xforms/buildlink3.mk                  |  6 +++---
 x11/xorg-libs/buildlink3.mk               |  6 +++---
 x11/xorg-libs/builtin.mk                  |  4 ++--
 x11/xosd/buildlink3.mk                    |  6 +++---
 x11/xscreensaver/Makefile.common          |  4 ++--
 x11/xscreensaver/buildlink3.mk            |  6 +++---
 x11/xview-lib/buildlink3.mk               |  6 +++---
 x11/zenity/Makefile                       |  4 ++--
 136 files changed, 390 insertions(+), 390 deletions(-)

(limited to 'x11')

diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 53fcde033f6..cbda07d5303 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/23 23:17:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFREE86_LIBS_BUILDLINK3_MK:=	${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES:=	XFree86-libs ${BUILDLINK_PACKAGES}
 
 .if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
-BUILDLINK_RECOMMENDED.XFree86-libs+=	XFree86-libs>=4.4.0nb7
+BUILDLINK_API_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
+BUILDLINK_ABI_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0nb7
 BUILDLINK_PKGSRCDIR.XFree86-libs?=	../../x11/XFree86-libs
 BUILDLINK_LIBDIRS.XFree86-libs?=	${X11ROOT_PREFIX}/lib
 BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
diff --git a/x11/XFree86-libs/builtin.mk b/x11/XFree86-libs/builtin.mk
index 5e0007c2f4e..ab078e059b3 100644
--- a/x11/XFree86-libs/builtin.mk
+++ b/x11/XFree86-libs/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:56 reed Exp $
 
 BUILTIN_PKG:=	XFree86-libs
 
@@ -43,7 +43,7 @@ USE_BUILTIN.XFree86-libs=	${IS_BUILTIN.XFree86-libs}
 .    if defined(BUILTIN_PKG.XFree86-libs) && \
         !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS])
 USE_BUILTIN.XFree86-libs=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.XFree86-libs}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.XFree86-libs}
 .        if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS])
 USE_BUILTIN.XFree86-libs!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index caa6ec2cd65..4c0db3d55ea 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw-Xpm}
 BUILDLINK_PACKAGES+=	Xaw-Xpm
 
 .if !empty(XAW_XPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
-BUILDLINK_RECOMMENDED.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
+BUILDLINK_API_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
+BUILDLINK_ABI_DEPENDS.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 .endif	# XAW_XPM_BUILDLINK3_MK
 
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
index 721eb18d1f9..f82a0b27afa 100644
--- a/x11/Xaw3d/buildlink3.mk
+++ b/x11/Xaw3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW3D_BUILDLINK3_MK:=	${XAW3D_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXaw3d}
 BUILDLINK_PACKAGES+=	Xaw3d
 
 .if !empty(XAW3D_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw3d+=	Xaw3d>=1.5
-BUILDLINK_RECOMMENDED.Xaw3d?=	Xaw3d>=1.5Enb1
+BUILDLINK_API_DEPENDS.Xaw3d+=	Xaw3d>=1.5
+BUILDLINK_ABI_DEPENDS.Xaw3d?=	Xaw3d>=1.5Enb1
 BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
 .endif	# XAW3D_BUILDLINK3_MK
 
diff --git a/x11/Xbae/buildlink3.mk b/x11/Xbae/buildlink3.mk
index 9e3c564d690..8763e24c35a 100644
--- a/x11/Xbae/buildlink3.mk
+++ b/x11/Xbae/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XBAE_BUILDLINK3_MK:=	${XBAE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXbae}
 BUILDLINK_PACKAGES+=	Xbae
 
 .if !empty(XBAE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xbae+=	Xbae>=4.8.4
-BUILDLINK_RECOMMENDED.Xbae+=	Xbae>=4.51.01nb2
+BUILDLINK_API_DEPENDS.Xbae+=	Xbae>=4.8.4
+BUILDLINK_ABI_DEPENDS.Xbae+=	Xbae>=4.51.01nb2
 BUILDLINK_PKGSRCDIR.Xbae?=	../../x11/Xbae
 .endif	# XBAE_BUILDLINK3_MK
 
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index c7423a5371f..a82889bb677 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XCOMPOSITE_BUILDLINK3_MK:=	${XCOMPOSITE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXcomposite}
 BUILDLINK_PACKAGES+=	Xcomposite
 
 .if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
-BUILDLINK_RECOMMENDED.Xcomposite?=	Xcomposite>=1.0.1nb2
+BUILDLINK_API_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
+BUILDLINK_ABI_DEPENDS.Xcomposite?=	Xcomposite>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
 .endif	# XCOMPOSITE_BUILDLINK3_MK
 
diff --git a/x11/Xcomposite/builtin.mk b/x11/Xcomposite/builtin.mk
index 52d643625b3..8a35aac5247 100644
--- a/x11/Xcomposite/builtin.mk
+++ b/x11/Xcomposite/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:56 reed Exp $
 
 BUILTIN_PKG:=	Xcomposite
 
@@ -34,7 +34,7 @@ USE_BUILTIN.Xcomposite=	${IS_BUILTIN.Xcomposite}
 .    if defined(BUILTIN_PKG.Xcomposite) && \
         !empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS])
 USE_BUILTIN.Xcomposite=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xcomposite}
 .        if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS])
 USE_BUILTIN.Xcomposite!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \
diff --git a/x11/Xfixes/buildlink3.mk b/x11/Xfixes/buildlink3.mk
index 55e56327c63..e3b8789c7b3 100644
--- a/x11/Xfixes/buildlink3.mk
+++ b/x11/Xfixes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFIXES_BUILDLINK3_MK:=	${XFIXES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXfixes}
 BUILDLINK_PACKAGES+=	Xfixes
 
 .if !empty(XFIXES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xfixes+=	Xfixes>=2.0.0
-BUILDLINK_RECOMMENDED.Xfixes+=	Xfixes>=2.0.1nb2
+BUILDLINK_API_DEPENDS.Xfixes+=	Xfixes>=2.0.0
+BUILDLINK_ABI_DEPENDS.Xfixes+=	Xfixes>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
 .endif	# XFIXES_BUILDLINK3_MK
 
diff --git a/x11/Xfixes/builtin.mk b/x11/Xfixes/builtin.mk
index f5696f18a59..506d4a6b937 100644
--- a/x11/Xfixes/builtin.mk
+++ b/x11/Xfixes/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:22:56 reed Exp $
 
 BUILTIN_PKG:=	Xfixes
 
@@ -33,7 +33,7 @@ USE_BUILTIN.Xfixes=	${IS_BUILTIN.Xfixes}
 .    if defined(BUILTIN_PKG.Xfixes) && \
         !empty(IS_BUILTIN.Xfixes:M[yY][eE][sS])
 USE_BUILTIN.Xfixes=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xfixes}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xfixes}
 .        if !empty(USE_BUILTIN.Xfixes:M[yY][eE][sS])
 USE_BUILTIN.Xfixes!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xfixes:Q}; then \
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index f8e7bc66577..5ea19b87097 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMHTML_BUILDLINK3_MK:=	${XMHTML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXmHTML}
 BUILDLINK_PACKAGES+=	XmHTML
 
 .if !empty(XMHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
-BUILDLINK_RECOMMENDED.XmHTML+=	XmHTML>=1.1.7nb5
+BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
+BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb5
 BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
 .endif	# XMHTML_BUILDLINK3_MK
 
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index 630d2b354b7..85dc627405a 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:31:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:56 reed Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -20,8 +20,8 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
 
 .include "../../x11/Xrender/buildlink3.mk"
 .include "../../x11/randrext/buildlink3.mk"
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 84161b91edb..3f674cf1b16 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:22:56 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrandr}
 BUILDLINK_PACKAGES+=	Xrandr
 
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=0.99
-BUILDLINK_RECOMMENDED.Xrandr+=	Xrandr>=1.0.2nb3
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=0.99
+BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
diff --git a/x11/Xrandr-mixedcase/builtin.mk b/x11/Xrandr-mixedcase/builtin.mk
index c62345d1bc2..ddb1082587d 100644
--- a/x11/Xrandr-mixedcase/builtin.mk
+++ b/x11/Xrandr-mixedcase/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.15 2006/04/06 06:22:56 reed Exp $
 
 BUILTIN_PKG:=	Xrandr
 
@@ -77,7 +77,7 @@ USE_BUILTIN.Xrandr=	${IS_BUILTIN.Xrandr}
 .    if defined(BUILTIN_PKG.Xrandr) && \
         !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS])
 USE_BUILTIN.Xrandr=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xrandr}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xrandr}
 .        if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
 USE_BUILTIN.Xrandr!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrandr:Q}; then	\
@@ -100,8 +100,8 @@ CHECK_BUILTIN.Xrandr?=	no
 .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.Xrandr:M[nN][oO])
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.1
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0.1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .  endif
 
 .  if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index affc1678e9d..eb6c66a5c64 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXrender}
 BUILDLINK_PACKAGES+=	Xrender
 
 .if !empty(XRENDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.2
-BUILDLINK_RECOMMENDED.Xrender+=	Xrender>=0.9.0nb1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.2
+BUILDLINK_ABI_DEPENDS.Xrender+=	Xrender>=0.9.0nb1
 BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
 .endif	# XRENDER_BUILDLINK3_MK
 
diff --git a/x11/Xrender/builtin.mk b/x11/Xrender/builtin.mk
index cccc7ec9213..b596f5eb625 100644
--- a/x11/Xrender/builtin.mk
+++ b/x11/Xrender/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.17 2006/04/06 06:22:57 reed Exp $
 
 BUILTIN_PKG:=	Xrender
 
@@ -77,7 +77,7 @@ USE_BUILTIN.Xrender=	${IS_BUILTIN.Xrender}
 .    if defined(BUILTIN_PKG.Xrender) && \
         !empty(IS_BUILTIN.Xrender:M[yY][eE][sS])
 USE_BUILTIN.Xrender=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xrender}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xrender}
 .        if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
 USE_BUILTIN.Xrender!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \
@@ -100,8 +100,8 @@ CHECK_BUILTIN.Xrender?=	no
 .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.Xrender:M[nN][oO])
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8.2
-BUILDLINK_DEPENDS.render+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8.2
+BUILDLINK_API_DEPENDS.render+=	Xrender>=0.8
 .  endif
 
 .  if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
index 886f7f25e1c..6a4018a508d 100644
--- a/x11/blt/buildlink3.mk
+++ b/x11/blt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblt}
 BUILDLINK_PACKAGES+=	blt
 
 .if !empty(BLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blt+=		blt>=2.4z
-BUILDLINK_RECOMMENDED.blt?=	blt>=2.4znb2
+BUILDLINK_API_DEPENDS.blt+=		blt>=2.4z
+BUILDLINK_ABI_DEPENDS.blt?=	blt>=2.4znb2
 BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
 .endif	# BLT_BUILDLINK3_MK
 
diff --git a/x11/compositeext/buildlink3.mk b/x11/compositeext/buildlink3.mk
index 531e6a352e4..e31d93c16f7 100644
--- a/x11/compositeext/buildlink3.mk
+++ b/x11/compositeext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:57 reed Exp $
 #
 # This Makefile fragment is included by packages that use compositeext.
 #
@@ -12,8 +12,8 @@ BUILDLINK_DEPENDS+=	compositeext
 
 .if !empty(COMPOSITEEXT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			compositeext
-BUILDLINK_DEPENDS.compositeext?=	compositeext>=2.0
-BUILDLINK_RECOMMENDED.compositeext?=	compositeext>=2.0nb1
+BUILDLINK_API_DEPENDS.compositeext?=	compositeext>=2.0
+BUILDLINK_ABI_DEPENDS.compositeext?=	compositeext>=2.0nb1
 BUILDLINK_PKGSRCDIR.compositeext?=	../../x11/compositeext
 
 .include "../../x11/fixesext/buildlink3.mk"
diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk
index 2d536a2d9ce..9433d3f9198 100644
--- a/x11/compositeext/builtin.mk
+++ b/x11/compositeext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.7 2006/04/06 06:22:57 reed Exp $
 
 BUILTIN_PKG:=	compositeext
 
@@ -40,7 +40,7 @@ USE_BUILTIN.compositeext=	${IS_BUILTIN.compositeext}
 .    if defined(BUILTIN_PKG.compositeext) && \
         !empty(IS_BUILTIN.compositeext:M[yY][eE][sS])
 USE_BUILTIN.compositeext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.compositeext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.compositeext}
 .        if !empty(USE_BUILTIN.compositeext:M[yY][eE][sS])
 USE_BUILTIN.compositeext!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeext:Q}; then \
diff --git a/x11/control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index 33208581e8e..502070f6f48 100644
--- a/x11/control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncontrol-center}
 BUILDLINK_PACKAGES+=	control-center
 
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
-BUILDLINK_RECOMMENDED.control-center+=	control-center>=1.4.0.5nb2
+BUILDLINK_API_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
+BUILDLINK_ABI_DEPENDS.control-center+=	control-center>=1.4.0.5nb2
 BUILDLINK_PKGSRCDIR.control-center?=	../../x11/control-center
 .endif	# CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index b9560a6288b..4e4ecf62cda 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/12 18:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:57 reed Exp $
 
 DISTNAME=		devilspie-0.17.1
 CATEGORIES=		x11
@@ -19,7 +19,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/devilspie
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/devilspie/
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.9.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index 6e48d91a2eb..0fc8c982d0b 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EFLTK_BUILDLINK3_MK:=	${EFLTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nefltk}
 BUILDLINK_PACKAGES+=	efltk
 
 .if !empty(EFLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.efltk+=	efltk>=2.0.5nb1
-BUILDLINK_RECOMMENDED.efltk?=	efltk>=2.0.5nb4
+BUILDLINK_API_DEPENDS.efltk+=	efltk>=2.0.5nb1
+BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.5nb4
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 .endif	# EFLTK_BUILDLINK3_MK
 
diff --git a/x11/fixesext/buildlink3.mk b/x11/fixesext/buildlink3.mk
index 83237742727..9939f2010e1 100644
--- a/x11/fixesext/buildlink3.mk
+++ b/x11/fixesext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIXESEXT_BUILDLINK3_MK:=	${FIXESEXT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfixesext}
 BUILDLINK_PACKAGES+=	fixesext
 
 .if !empty(FIXESEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fixesext+=	fixesext>=2.0
-BUILDLINK_RECOMMENDED.fixesext?=	fixesext>=2.0.1nb1
+BUILDLINK_API_DEPENDS.fixesext+=	fixesext>=2.0
+BUILDLINK_ABI_DEPENDS.fixesext?=	fixesext>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.fixesext?=	../../x11/fixesext
 .endif	# FIXESEXT_BUILDLINK3_MK
 
diff --git a/x11/fixesext/builtin.mk b/x11/fixesext/builtin.mk
index 56586af3ee9..2b38671405d 100644
--- a/x11/fixesext/builtin.mk
+++ b/x11/fixesext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:57 reed Exp $
 
 BUILTIN_PKG:=	fixesext
 
@@ -40,7 +40,7 @@ USE_BUILTIN.fixesext=	${IS_BUILTIN.fixesext}
 .    if defined(BUILTIN_PKG.fixesext) && \
         !empty(IS_BUILTIN.fixesext:M[yY][eE][sS])
 USE_BUILTIN.fixesext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.fixesext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.fixesext}
 .        if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS])
 USE_BUILTIN.fixesext!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index a94cea57090..572959f493d 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:57 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk}
 BUILDLINK_PACKAGES+=	fltk
 
 .if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fltk+=	fltk>=1.1.5rc1
-BUILDLINK_RECOMMENDED.fltk+=	fltk>=1.1.7nb1
+BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1
+BUILDLINK_ABI_DEPENDS.fltk+=	fltk>=1.1.7nb1
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
 BUILDLINK_FILES.fltk+=		include/Fl/*
 .endif	# FLTK_BUILDLINK3_MK
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 677fd9af47f..aa67dd4d3df 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:58 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfox}
 BUILDLINK_PACKAGES+=	fox
 
 .if !empty(FOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fox+=		fox>=1.4.16
-BUILDLINK_RECOMMENDED.fox?=	fox>=1.4.17nb1
+BUILDLINK_API_DEPENDS.fox+=		fox>=1.4.16
+BUILDLINK_ABI_DEPENDS.fox?=	fox>=1.4.17nb1
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 BUILDLINK_INCDIRS.fox?=		include/fox-1.4
 .endif	# FOX_BUILDLINK3_MK
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d971381f7d4..e315939b3de 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2006/04/06 06:22:58 reed Exp $
 #
 
 DISTNAME=	gdm-2.14.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 
 DEPENDS+=	zenity>=2.14.0:../../x11/zenity
 
-BUILDLINK_DEPENDS.libart2+=	libart2>=2.3.11
+BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.11
 
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index c9f5ec82741..9eb78378be5 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/03/30 21:47:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2006/04/06 06:22:58 reed Exp $
 #
 
 DISTNAME=		gnome-desktop-2.14.0
@@ -20,7 +20,7 @@ USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--with-gnome-distributor="The NetBSD Foundation"
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 post-install:
 .for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 4fbbc734b63..3e221834a53 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/03/30 21:47:15 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:58 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.14.0
+BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.14.0
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 5d73c878650..a115a25c157 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:58 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-libs}
 BUILDLINK_PACKAGES+=	gnome-libs
 
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
-BUILDLINK_RECOMMENDED.gnome-libs+=	gnome-libs>=1.4.2nb5
+BUILDLINK_API_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
+BUILDLINK_ABI_DEPENDS.gnome-libs+=	gnome-libs>=1.4.2nb5
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 .endif	# GNOME_LIBS_BUILDLINK3_MK
 
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 325ee82d388..7177e00e59a 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:58 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-mag}
 BUILDLINK_PACKAGES+=	gnome-mag
 
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
-BUILDLINK_RECOMMENDED.gnome-mag?=	gnome-mag>=0.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
+BUILDLINK_ABI_DEPENDS.gnome-mag?=	gnome-mag>=0.12.2nb2
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
 .endif	# GNOME_MAG_BUILDLINK3_MK
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 52486406c86..b22b3c536ea 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/03/30 21:15:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.68 2006/04/06 06:22:58 reed Exp $
 #
 
 DISTNAME=		gnome-panel-2.14.0
@@ -33,10 +33,10 @@ GCONF2_SCHEMAS+=	workspace-switcher.schemas
 GCONF2_SCHEMAS+=	window-list.schemas
 GCONF2_ENTRIES=		panel-default-setup.entries
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.5.0
-BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.13.0
-BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.13.5
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.5.0
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.0
+BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.13.5
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 23c23099ed4..2d03ac06bc7 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:58 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
 BUILDLINK_PACKAGES+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
-BUILDLINK_RECOMMENDED.gnome-panel?=	gnome-panel>=2.12.3
+BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
+BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.12.3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 609a110734c..9f2412ba6b6 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/04/02 11:07:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.66 2006/04/06 06:22:58 reed Exp $
 #
 
 DISTNAME=		gnome-session-2.14.0
@@ -31,8 +31,8 @@ GCONF2_SCHEMAS= 	gnome-session.schemas
 
 # Make sure we do not use old packages that rely on XDG_{CONFIG,DATA}_DIRS
 # in the environment being set.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.1
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index a91c5a71fa7..84a625feecf 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/06 00:18:26 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/04/06 06:22:59 reed Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.8.1
@@ -30,7 +30,7 @@ USE_TOOLS+=		gmake pkg-config
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 969060af983..4bec8c4a2f0 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/04/01 17:50:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:22:59 reed Exp $
 #
 
 DISTNAME=		gnome-applets-2.14.0
@@ -69,9 +69,9 @@ PRINT_PLIST_AWK+=	/examples/ { print "$${BATTSTAT}"$$0; next; }
 
 .include "../../devel/GConf2/schemas.mk"
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
-BUILDLINK_DEPENDS.gnome-panel+=	gnome-panel>=2.13.4
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.gnome-panel+=	gnome-panel>=2.13.4
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 2f56f909e05..d563e867437 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/06 06:23:00 reed Exp $
 #
 
 DISTNAME=	control-center-2.14.0
@@ -43,8 +43,8 @@ CONF_FILES=		${EGDIR}/theme-method.conf \
 CONF_FILES+=		${EGDIR}/font-method.conf \
 			${PKG_SYSCONFDIR}/font-method.conf
 
-BUILDLINK_DEPENDS.glib2=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.8.12
+BUILDLINK_API_DEPENDS.glib2=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.12
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 6b87fd1880d..bfe75a01500 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:00 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
 BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
-BUILDLINK_RECOMMENDED.gnome2-control-center?=	gnome2-control-center>=2.12.1nb5
+BUILDLINK_API_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.12.1nb5
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 5b1e2a7d558..b62938ed007 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/03/30 21:18:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:23:00 reed Exp $
 #
 
 DISTNAME=		gnome-terminal-2.14.0
@@ -24,7 +24,7 @@ USE_LIBTOOL=		YES
 
 GCONF2_SCHEMAS= 	gnome-terminal.schemas
 
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink3.mk"
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 7b395f7a2f2..212d35148b9 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2006/04/06 06:23:00 reed Exp $
 #
 
 DISTNAME=		gnopernicus-1.0.3
@@ -52,7 +52,7 @@ GCONF2_SCHEMAS+=	brlmonitor.schemas
 GCONF2_SCHEMAS+=	gnopernicus.schemas
 GCONF2_SCHEMAS+=	remote.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.1
 
 .include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index eb716f50f7d..81221e7a155 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:00 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BACK_BUILDLINK3_MK:=	${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-back}
 BUILDLINK_PACKAGES+=	gnustep-back
 
 .if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-back+=	gnustep-back>=0.10.2nb2
+BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.10.2nb2
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 .endif	# GNUSTEP_BACK_BUILDLINK3_MK
 
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 767ad598b78..9c1e30ab8d8 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:00 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_GUI_BUILDLINK3_MK:=	${GNUSTEP_GUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-gui}
 BUILDLINK_PACKAGES+=	gnustep-gui
 
 .if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-gui+=		gnustep-gui>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-gui+=	gnustep-gui>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gnustep-gui+=		gnustep-gui>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Bundles\/GSPrinting$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index e2e621632b9..65ff4e1b37a 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:00 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNUSTEP_PREFERENCES_BUILDLINK3_MK:=	${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnustep-preferences}
 BUILDLINK_PACKAGES+=	gnustep-preferences
 
 .if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
-BUILDLINK_RECOMMENDED.gnustep-preferences?=	gnustep-preferences>=1.2.0nb13
+BUILDLINK_API_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
+BUILDLINK_ABI_DEPENDS.gnustep-preferences?=	gnustep-preferences>=1.2.0nb13
 BUILDLINK_PKGSRCDIR.gnustep-preferences?=	../../x11/gnustep-preferences
 .endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk
index dcff7a91b59..41c922ab971 100644
--- a/x11/gtk+extra/buildlink3.mk
+++ b/x11/gtk+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK+EXTRA_BUILDLINK3_MK:=	${GTK+EXTRA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk+extra}
 BUILDLINK_PACKAGES+=	gtk+extra
 
 .if !empty(GTK+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
-BUILDLINK_RECOMMENDED.gtk+extra?=	gtk+extra>=0.99.17nb5
+BUILDLINK_API_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
+BUILDLINK_ABI_DEPENDS.gtk+extra?=	gtk+extra>=0.99.17nb5
 BUILDLINK_PKGSRCDIR.gtk+extra?=	../../x11/gtk+extra
 .endif	# GTK+EXTRA_BUILDLINK3_MK
 
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 949da969122..65b9900edae 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:00 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
 BUILDLINK_PACKAGES+=	gtk
 
 .if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
-BUILDLINK_RECOMMENDED.gtk+=	gtk+>=1.2.10nb9
+BUILDLINK_API_DEPENDS.gtk+=		gtk+>=1.2.10
+BUILDLINK_ABI_DEPENDS.gtk+=	gtk+>=1.2.10nb9
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 .endif	# GTK_BUILDLINK3_MK
 
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index c3f5fd286c9..bf902f1e96c 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2+EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2+extra}
 BUILDLINK_PACKAGES+=	gtk2+extra
 
 .if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
-BUILDLINK_RECOMMENDED.gtk2+extra?=	gtk2+extra>=2.1.1nb2
+BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
+BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.1nb2
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
 .endif	# GTK2+EXTRA_BUILDLINK3_MK
 
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 30536e87b62..14e8a5f7a97 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/03/30 21:11:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2006/04/06 06:23:01 reed Exp $
 
 DISTNAME=		gtk-engines-2.6.8
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -15,7 +15,7 @@ CONFLICTS+=		gtk2-engines-clearlooks-[0-9]*
 CONFLICTS+=		gtk2-engines-industrial-[0-9]*
 CONFLICTS+=		gnome-themes-extras<0.8
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.4
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.4
 
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 872914a1514..2be006a779b 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2-engines}
 BUILDLINK_PACKAGES+=	gtk2-engines
 
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
-BUILDLINK_RECOMMENDED.gtk2-engines?=	gtk2-engines>=2.6.6nb2
+BUILDLINK_API_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
+BUILDLINK_ABI_DEPENDS.gtk2-engines?=	gtk2-engines>=2.6.6nb2
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 .endif	# GTK2_ENGINES_BUILDLINK3_MK
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 9293d4cd1dc..6fe494afa1b 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2006/03/30 20:48:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.117 2006/04/06 06:23:01 reed Exp $
 
 DISTNAME=		gtk+-2.8.16
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
@@ -17,9 +17,9 @@ CONFLICTS=		gtk2-engines<2.6.0
 
 BUILD_USES_MSGFMT=	yes
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.10.1
-BUILDLINK_DEPENDS.pango+=	pango>=1.10.0
-BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.10.1
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.10.0
+BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 8320667d4d8..4b21d2308e4 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk2}
 BUILDLINK_PACKAGES+=	gtk2
 
 .if !empty(GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.4.0
-BUILDLINK_RECOMMENDED.gtk2+=	gtk2+>=2.8.11nb1
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
+BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.8.11nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0$$/ { next; }
diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk
index ded86725c30..7866a607166 100644
--- a/x11/gtkglarea/buildlink3.mk
+++ b/x11/gtkglarea/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA_BUILDLINK3_MK:=	${GTKGLAREA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea}
 BUILDLINK_PACKAGES+=	gtkglarea
 
 .if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
-BUILDLINK_RECOMMENDED.gtkglarea?=	gtkglarea>=1.2.3nb2
+BUILDLINK_API_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea?=	gtkglarea>=1.2.3nb2
 BUILDLINK_PKGSRCDIR.gtkglarea?=	../../x11/gtkglarea
 .endif	# GTKGLAREA_BUILDLINK3_MK
 
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index 415f58da3e5..58fe2b80902 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA2_BUILDLINK3_MK:=	${GTKGLAREA2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkglarea2}
 BUILDLINK_PACKAGES+=	gtkglarea2
 
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
-BUILDLINK_RECOMMENDED.gtkglarea2?=	gtkglarea2>=1.99.0nb6
+BUILDLINK_API_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea2?=	gtkglarea2>=1.99.0nb6
 BUILDLINK_PKGSRCDIR.gtkglarea2?=	../../x11/gtkglarea2
 .endif	# GTKGLAREA2_BUILDLINK3_MK
 
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 94eb958021d..a0056482062 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/02/14 22:05:44 adam Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/06 06:23:01 reed Exp $
 
 DISTNAME=	gtkmm-2.8.3
 CATEGORIES=	x11
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+=	gdk/gdkmm-2.4.pc.in
 PKGCONFIG_OVERRIDE+=	gtk/gtkmm-2.4.pc.in
 PKGCONFIG_OVERRIDE+=	pango/pangomm-1.4.pc.in
 
-BUILDLINK_DEPENDS.glibmm+=	glibmm>=2.8.0
+BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.8.0
 
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index d7a56f801f7..87f7587432d 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtkmm}
 BUILDLINK_PACKAGES+=	gtkmm
 
 .if !empty(GTKMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkmm+=	gtkmm>=2.6.3
-BUILDLINK_RECOMMENDED.gtkmm?=	gtkmm>=2.8.2nb2
+BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.6.3
+BUILDLINK_ABI_DEPENDS.gtkmm?=	gtkmm>=2.8.2nb2
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
 .endif	# GTKMM_BUILDLINK3_MK
 
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 8d06e365dc1..c6f6be1e3e4 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtksourceview}
 BUILDLINK_PACKAGES+=	gtksourceview
 
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
-BUILDLINK_RECOMMENDED.gtksourceview?=	gtksourceview>=1.4.2nb2
+BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
+BUILDLINK_ABI_DEPENDS.gtksourceview?=	gtksourceview>=1.4.2nb2
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 .endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
diff --git a/x11/gtoolkit/buildlink3.mk b/x11/gtoolkit/buildlink3.mk
index 96fd32939da..6bde62d597d 100644
--- a/x11/gtoolkit/buildlink3.mk
+++ b/x11/gtoolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTOOLKIT_BUILDLINK3_MK:=	${GTOOLKIT_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtoolkit}
 BUILDLINK_PACKAGES+=	gtoolkit
 
 .if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
-BUILDLINK_RECOMMENDED.gtoolkit+=gtoolkit>=0.9.5nb7
-BUILDLINK_RECOMMENDED.gtoolkit?=	gtoolkit>=0.9.5nb9
+BUILDLINK_API_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
+BUILDLINK_ABI_DEPENDS.gtoolkit+=gtoolkit>=0.9.5nb7
+BUILDLINK_ABI_DEPENDS.gtoolkit?=	gtoolkit>=0.9.5nb9
 BUILDLINK_PKGSRCDIR.gtoolkit?=	../../x11/gtoolkit
 .endif	# GTOOLKIT_BUILDLINK3_MK
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 4386060a604..468aee05f43 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/04/02 02:01:58 markd Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/06 06:23:01 reed Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	1
@@ -90,8 +90,8 @@ PKG_SUGGESTED_OPTIONS=	sasl
 
 .include "../../mk/bsd.options.mk"
 
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=${_KDE_VERSION}
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=${_KDE_VERSION}
 
 DEPENDS+=		htdig>=3.2.0:../../www/htdig-devel
 
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index ba003b56de9..2a53414741f 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:11:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebase}
 BUILDLINK_PACKAGES+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.5.1nb2
+BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdebase?=	kdebase>=3.5.1nb2
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
@@ -24,7 +24,7 @@ MAKEFLAGS+=	PKG_BUILD_OPTIONS.kdebase=${PKG_BUILD_OPTIONS.kdebase:Q}
 .endif
 MAKEVARS+=	PKG_BUILD_OPTIONS.kdebase
 
-BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
+BUILDLINK_API_DEPENDS.Xrandr+=      Xrandr>=1.0
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 0da7c23b63b..4c539435ea2 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdelibs}
 BUILDLINK_PACKAGES+=	kdelibs
 
 .if !empty(KDELIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.2.0
-BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.2.0
+BUILDLINK_ABI_DEPENDS.kdelibs?=	kdelibs>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
 
 .include "../../x11/kdelibs3/dirs.mk"
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 95e9b6c3f13..344648ca437 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:31:09 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:23:01 reed Exp $
 
 DISTNAME=	lablgtk-1.2.7
 PKGREVISION=	3
@@ -12,7 +12,7 @@ COMMENT=	GTK+ bindings for ocaml
 USE_TOOLS+=	gmake
 
 BUILDLINK_DEPMETHOD.ocaml=	full
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.0.5
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.0.5
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/lablgtk/buildlink3.mk b/x11/lablgtk/buildlink3.mk
index e7617855c4f..6fa1f70d2f9 100644
--- a/x11/lablgtk/buildlink3.mk
+++ b/x11/lablgtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LABLGTK_BUILDLINK3_MK:=	${LABLGTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk}
 BUILDLINK_PACKAGES+=	lablgtk
 
 .if !empty(LABLGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
-BUILDLINK_RECOMMENDED.lablgtk?=	lablgtk>=1.2.7nb2
+BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
+BUILDLINK_ABI_DEPENDS.lablgtk?=	lablgtk>=1.2.7nb2
 BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
 .endif	# LABLGTK_BUILDLINK3_MK
 
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index cb23b9b3914..a80633b020e 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LABLGTK2_BUILDLINK3_MK:=	${LABLGTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk2}
 BUILDLINK_PACKAGES+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
-BUILDLINK_RECOMMENDED.lablgtk2?=	lablgtk2>=2.6.0nb5
+BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
+BUILDLINK_ABI_DEPENDS.lablgtk2?=	lablgtk2>=2.6.0nb5
 BUILDLINK_PKGSRCDIR.lablgtk2?=	../../x11/lablgtk2
 .endif	# LABLGTK2_BUILDLINK3_MK
 
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index 46851cf4020..5102bf6c923 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:01 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LESSTIF_BUILDLINK3_MK:=	${LESSTIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlesstif}
 BUILDLINK_PACKAGES+=	lesstif
 
 .if !empty(LESSTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lesstif+=	lesstif>=0.91.4
-BUILDLINK_RECOMMENDED.lesstif+=	lesstif>=0.94.4nb2
+BUILDLINK_API_DEPENDS.lesstif+=	lesstif>=0.91.4
+BUILDLINK_ABI_DEPENDS.lesstif+=	lesstif>=0.94.4nb2
 BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
 .endif	# LESSTIF_BUILDLINK3_MK
 
diff --git a/x11/libexo/buildlink3.mk b/x11/libexo/buildlink3.mk
index 3d202f26445..34d30350f76 100644
--- a/x11/libexo/buildlink3.mk
+++ b/x11/libexo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXO_BUILDLINK3_MK:=	${EXO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nexo}
 BUILDLINK_PACKAGES+=	exo
 
 .if !empty(EXO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.exo+=		exo>=0.3.0
-BUILDLINK_RECOMMENDED.exo?=	exo>=0.3.0nb2
+BUILDLINK_API_DEPENDS.exo+=		exo>=0.3.0
+BUILDLINK_ABI_DEPENDS.exo?=	exo>=0.3.0nb2
 BUILDLINK_PKGSRCDIR.exo?=	../../x11/libexo
 .endif	# EXO_BUILDLINK3_MK
 
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 60f8c75330f..4cfc3fdcb8e 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4gui}
 BUILDLINK_PACKAGES+=	libxfce4gui
 
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4gui?=	libxfce4gui>=4.2.3nb2
+BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4gui?=	libxfce4gui>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
diff --git a/x11/libxfce4mcs/buildlink3.mk b/x11/libxfce4mcs/buildlink3.mk
index 4021fe57427..b60dd3f2664 100644
--- a/x11/libxfce4mcs/buildlink3.mk
+++ b/x11/libxfce4mcs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4MCS_BUILDLINK3_MK:=	${LIBXFCE4MCS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4mcs}
 BUILDLINK_PACKAGES+=	libxfce4mcs
 
 .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4mcs?=	libxfce4mcs>=4.2.3nb1
+BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4mcs?=	libxfce4mcs>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
 .endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
diff --git a/x11/libxfce4util/buildlink3.mk b/x11/libxfce4util/buildlink3.mk
index f656d883a61..ffa4f989449 100644
--- a/x11/libxfce4util/buildlink3.mk
+++ b/x11/libxfce4util/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:25 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4UTIL_BUILDLINK3_MK:=	${LIBXFCE4UTIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxfce4util}
 BUILDLINK_PACKAGES+=	libxfce4util
 
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
-BUILDLINK_RECOMMENDED.libxfce4util?=	libxfce4util>=4.2.3.2nb1
+BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
+BUILDLINK_ABI_DEPENDS.libxfce4util?=	libxfce4util>=4.2.3.2nb1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 .endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index 1b291e329d1..fe84d9c890a 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXKLAVIER_BUILDLINK3_MK:=	${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibxklavier}
 BUILDLINK_PACKAGES+=	libxklavier
 
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxklavier+=		libxklavier>=2.0
-BUILDLINK_RECOMMENDED.libxklavier?=	libxklavier>=2.0nb1
+BUILDLINK_API_DEPENDS.libxklavier+=		libxklavier>=2.0
+BUILDLINK_ABI_DEPENDS.libxklavier?=	libxklavier>=2.0nb1
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
 .endif	# LIBXKLAVIER_BUILDLINK3_MK
 
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index 7abc96fdb3b..28b39548637 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibzvt}
 BUILDLINK_PACKAGES+=	libzvt
 
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
-BUILDLINK_RECOMMENDED.libzvt+=	libzvt>=2.0.1nb8
+BUILDLINK_API_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
+BUILDLINK_ABI_DEPENDS.libzvt+=	libzvt>=2.0.1nb8
 BUILDLINK_PKGSRCDIR.libzvt?=	../../x11/libzvt
 .endif	# LIBZVT_BUILDLINK3_MK
 
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index 8b8ae309984..416b291ee25 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOWITZ_BUILDLINK3_MK:=	${MOWITZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMowitz}
 BUILDLINK_PACKAGES+=	Mowitz
 
 .if !empty(MOWITZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Mowitz+=	Mowitz>=0.2.1
-BUILDLINK_RECOMMENDED.Mowitz+=	Mowitz>=0.2.2nb2
+BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.2.1
+BUILDLINK_ABI_DEPENDS.Mowitz+=	Mowitz>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.Mowitz?=	../../x11/mowitz
 .endif	# MOWITZ_BUILDLINK3_MK
 
diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk
index 5e6e37bc716..621b6d3e980 100644
--- a/x11/neXtaw/buildlink3.mk
+++ b/x11/neXtaw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEXTAW_BUILDLINK3_MK:=	${NEXTAW_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NneXtaw}
 BUILDLINK_PACKAGES+=	neXtaw
 
 .if !empty(NEXTAW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neXtaw+=	neXtaw>=0.15.1
-BUILDLINK_RECOMMENDED.neXtaw+=	neXtaw>=0.15.1nb2
+BUILDLINK_API_DEPENDS.neXtaw+=	neXtaw>=0.15.1
+BUILDLINK_ABI_DEPENDS.neXtaw+=	neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=	../../x11/neXtaw
 .endif	# NEXTAW_BUILDLINK3_MK
 
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index cb9a0f95912..f09e168a643 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OCAML_GRAPHICS_BUILDLINK3_MK:=	${OCAML_GRAPHICS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nocaml-graphics}
 BUILDLINK_PACKAGES+=	ocaml-graphics
 
 .if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
-BUILDLINK_RECOMMENDED.ocaml-graphics?=	ocaml-graphics>=3.09.1
+BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
+BUILDLINK_ABI_DEPENDS.ocaml-graphics?=	ocaml-graphics>=3.09.1
 BUILDLINK_PKGSRCDIR.ocaml-graphics?=	../../x11/ocaml-graphics
 .endif	# OCAML_GRAPHICS_BUILDLINK3_MK
 
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 9ba526c7406..62757f0516f 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENMOTIF_BUILDLINK3_MK:=	${OPENMOTIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenmotif}
 BUILDLINK_PACKAGES+=	openmotif
 
 .if !empty(OPENMOTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openmotif+=	openmotif>=2.2.3
-BUILDLINK_RECOMMENDED.openmotif?=	openmotif>=2.2.3nb2
+BUILDLINK_API_DEPENDS.openmotif+=	openmotif>=2.2.3
+BUILDLINK_ABI_DEPENDS.openmotif?=	openmotif>=2.2.3nb2
 BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
 .endif	# OPENMOTIF_BUILDLINK3_MK
 
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 948dedb8ad2..48cd8ed70ed 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparagui}
 BUILDLINK_PACKAGES+=	paragui
 
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.paragui+=	paragui>=1.0.4nb3
-BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb10
+BUILDLINK_API_DEPENDS.paragui+=	paragui>=1.0.4nb3
+BUILDLINK_ABI_DEPENDS.paragui+=	paragui>=1.0.4nb10
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 .endif	# PARAGUI_BUILDLINK3_MK
 
diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk
index 39a0c8c1209..07de4a7b10c 100644
--- a/x11/py-Pmw/buildlink3.mk
+++ b/x11/py-Pmw/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_PMW_BUILDLINK3_MK:=	${PY_PMW_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npypmw}
 BUILDLINK_PACKAGES+=	pypmw
 
 .if !empty(PY_PMW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
-BUILDLINK_RECOMMENDED.pypmw?=	${PYPKGPREFIX}-Pmw>=1.2nb1
+BUILDLINK_API_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
+BUILDLINK_ABI_DEPENDS.pypmw?=	${PYPKGPREFIX}-Pmw>=1.2nb1
 BUILDLINK_PKGSRCDIR.pypmw?=	../../x11/py-Pmw
 .endif	# PY_PMW_BUILDLINK3_MK
 
diff --git a/x11/py-Tk/buildlink3.mk b/x11/py-Tk/buildlink3.mk
index a079b2d48d5..5287bacf38e 100644
--- a/x11/py-Tk/buildlink3.mk
+++ b/x11/py-Tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYTK_BUILDLINK3_MK:=	${PYTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npytk}
 BUILDLINK_PACKAGES+=	pytk
 
 .if !empty(PYTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
-BUILDLINK_RECOMMENDED.pytk?=	${PYPKGPREFIX}-Tk>=0nb4
+BUILDLINK_API_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
+BUILDLINK_ABI_DEPENDS.pytk?=	${PYPKGPREFIX}-Tk>=0nb4
 BUILDLINK_PKGSRCDIR.pytk?=	../../x11/py-Tk
 .endif	# PYTK_BUILDLINK3_MK
 
diff --git a/x11/py-Xlib/buildlink3.mk b/x11/py-Xlib/buildlink3.mk
index dc4d274b09a..d11fccde65d 100644
--- a/x11/py-Xlib/buildlink3.mk
+++ b/x11/py-Xlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_XLIB_BUILDLINK3_MK:=	${PY_XLIB_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-Xlib}
 BUILDLINK_PACKAGES+=	py-Xlib
 
 .if !empty(PY_XLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
-BUILDLINK_RECOMMENDED.py-Xlib?=	${PYPKGPREFIX}-Xlib>=0.12nb1
+BUILDLINK_API_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
+BUILDLINK_ABI_DEPENDS.py-Xlib?=	${PYPKGPREFIX}-Xlib>=0.12nb1
 BUILDLINK_PKGSRCDIR.py-Xlib?=	../../x11/py-Xlib
 .endif	# PY_XLIB_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index f149169dac2..490d4698a48 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/06 00:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:23:02 reed Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.12.0
@@ -21,7 +21,7 @@ USE_TOOLS+=		pkg-config
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 
-BUILDLINK_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.11.1
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.11.1
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 401e13e6397..6e7889e1097 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2EX_BUILDLINK3_MK:=	${PY_GNOME2EX_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2ex}
 BUILDLINK_PACKAGES+=	pygnome2ex
 
 .if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_RECOMMENDED.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
+BUILDLINK_API_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
+BUILDLINK_ABI_DEPENDS.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 .endif	# PY_GNOME2EX_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 559b2929a29..0691f97e5ce 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/06 00:18:27 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:23:02 reed Exp $
 #
 
 DISTNAME=	gnome-python-2.12.3
@@ -24,18 +24,18 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.11.1
+BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.11.1
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
+BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
 .include "../../net/py-ORBit/buildlink3.mk"
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.0
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
+BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
 .include "../../x11/py-gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index bd140fe0cf9..e2ed8487056 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2}
 BUILDLINK_PACKAGES+=	pygnome2
 
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_RECOMMENDED.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb3
+BUILDLINK_API_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
+BUILDLINK_ABI_DEPENDS.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb3
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 .endif	# PY_GNOME2_BUILDLINK3_MK
 
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 665e5df149e..a89ded80b61 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/07 21:27:28 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
 BUILDLINK_PACKAGES+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
+BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 .endif	# PY_GTK2_BUILDLINK3_MK
 
diff --git a/x11/py-qt2-sip/buildlink3.mk b/x11/py-qt2-sip/buildlink3.mk
index 44efe086b93..924dbc746a5 100644
--- a/x11/py-qt2-sip/buildlink3.mk
+++ b/x11/py-qt2-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:02 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_QT2_SIP_BUILDLINK3_MK:=	${PY_QT2_SIP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt2sip}
 BUILDLINK_PACKAGES+=	pyqt2sip
 
 .if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
-BUILDLINK_RECOMMENDED.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb3
+BUILDLINK_API_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb3
 BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
 .endif	# PY_QT2_SIP_BUILDLINK3_MK
 
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 1867d5eccce..853a998fe69 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/02 21:53:52 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:02 reed Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
@@ -24,7 +24,7 @@ MAKE_ENV+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 # MesaLib is pulled in through qt2-libs; we need a version
 # which doesn't (needlessly) link to libpthread
-BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=6.4.2nb1
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=6.4.2nb1
 
 .include "../../lang/python/extension.mk"
 
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index ce776f8341e..01669076ef5 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/10 10:45:02 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:23:03 reed Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
@@ -8,7 +8,7 @@ PKGREVISION=		2
 
 COMMENT=		Python binding for Qt3
 
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb2
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb2
 
 PLIST_SRC=		${PKGDIR}/PLIST.common
 .if ${OPSYS} == "Darwin"
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 4fbb91cfa5a..df09a202bcb 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-base}
 BUILDLINK_PACKAGES+=	pyqt3-base
 
 .if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1nb2
 BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 09f5ec3f4ee..03357aa6af5 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_MOD_BUILDLINK3_MK:=	${PYQT3_MOD_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-mod}
 BUILDLINK_PACKAGES+=	pyqt3-mod
 
 .if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-mod?=	${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-mod?=	${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
 BUILDLINK_PKGSRCDIR.pyqt3-mod?=	../../x11/py-qt3-modules
 
 BUILDLINK_LIBDIRS.pyqt3-mod+=	${PYSITELIB}
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
index 62a29fc34e6..d6d4fd5111a 100644
--- a/x11/py-qt3-sip/buildlink3.mk
+++ b/x11/py-qt3-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYQT3_SIP_BUILDLINK3_MK:=	${PYQT3_SIP_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-sip}
 BUILDLINK_PACKAGES+=	pyqt3-sip
 
 .if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
-BUILDLINK_RECOMMENDED.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
+BUILDLINK_API_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
+BUILDLINK_ABI_DEPENDS.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
 BUILDLINK_PKGSRCDIR.pyqt3-sip?=	../../x11/py-qt3-sip
 
 BUILDLINK_LIBDIRS.pyqt3-sip+=	${PYSITELIB}
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index f4efe7bf2eb..fa9664e489b 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_WXWIDGETS_BUILDLINK3_MK:=	${PY_WXWIDGETS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-wxWidgets}
 BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-wxWidgets
 
 .if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK/buildlink3.mk"
diff --git a/x11/pygtk/buildlink3.mk b/x11/pygtk/buildlink3.mk
index 5528cb99aee..64183d6d70a 100644
--- a/x11/pygtk/buildlink3.mk
+++ b/x11/pygtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GTK_BUILDLINK3_MK:=	${PY_GTK_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk}
 BUILDLINK_PACKAGES+=	pygtk
 
 .if !empty(PY_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.9nb4
-BUILDLINK_RECOMMENDED.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.11nb2
+BUILDLINK_API_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.9nb4
+BUILDLINK_ABI_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.11nb2
 BUILDLINK_PKGSRCDIR.pygtk?=	../../x11/pygtk
 .endif	# PY_GTK_BUILDLINK3_MK
 
diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk
index a795f2a696e..0a46e3a891c 100644
--- a/x11/qt1/buildlink3.mk
+++ b/x11/qt1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QT1_BUILDLINK3_MK:=	${QT1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt1}
 BUILDLINK_PACKAGES+=	qt1
 
 .if !empty(QT1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt1+=		qt1>=1.44
-BUILDLINK_RECOMMENDED.qt1+=	qt1>=1.44nb3
+BUILDLINK_API_DEPENDS.qt1+=		qt1>=1.44
+BUILDLINK_ABI_DEPENDS.qt1+=	qt1>=1.44nb3
 BUILDLINK_PKGSRCDIR.qt1?=	../../x11/qt1
 
 BUILDLINK_PASSTHRU_DIRS=	${LOCALBASE}/qt1
diff --git a/x11/qt2-designer/buildlink3.mk b/x11/qt2-designer/buildlink3.mk
index 9c6d68b401b..4a1219fa291 100644
--- a/x11/qt2-designer/buildlink3.mk
+++ b/x11/qt2-designer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_DESIGNER_BUILDLINK3_MK:=	${QT2_DESIGNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt2-designer}
 BUILDLINK_PACKAGES+=	qt2-designer
 
 .if !empty(QT2_DESIGNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-designer+=	qt2-designer>=2.3.1nb5
+BUILDLINK_API_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb5
 BUILDLINK_PKGSRCDIR.qt2-designer?=	../../x11/qt2-designer
 .endif	# QT2_DESIGNER_BUILDLINK3_MK
 
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 0936881ddd7..8c19310a671 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt2-libs}
 BUILDLINK_PACKAGES+=	qt2-libs
 
 .if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-libs+=	qt2-libs>=2.3.1nb8
+BUILDLINK_API_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb8
 BUILDLINK_PKGSRCDIR.qt2-libs?=	../../x11/qt2-libs
 BUILDLINK_INCDIRS.qt2-libs=	qt2/include
 BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 55ec275e4a1..bb578572b11 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 23:24:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-libs}
 BUILDLINK_PACKAGES+=	qt3-libs
 
 .if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
-BUILDLINK_RECOMMENDED.qt3-libs?=	qt3-libs>=3.3.5nb4
+BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
+BUILDLINK_ABI_DEPENDS.qt3-libs?=	qt3-libs>=3.3.5nb4
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index ea34cdbdde2..7c5112e0d34 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_QSCINTILLA_BUILDLINK3_MK:=	${QT3_QSCINTILLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-qscintilla}
 BUILDLINK_PACKAGES+=	qt3-qscintilla
 
 .if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
-BUILDLINK_RECOMMENDED.qt3-qscintilla+=	qt3-qscintilla>=1.6nb2
+BUILDLINK_API_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
+BUILDLINK_ABI_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.6nb2
 BUILDLINK_PKGSRCDIR.qt3-qscintilla?=	../../x11/qt3-qscintilla
 .endif	# QT3_QSCINTILLA_BUILDLINK3_MK
 
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index ca8ea484f1f..3ce7929074f 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 23:26:26 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt3-tools}
 BUILDLINK_PACKAGES+=	qt3-tools
 
 .if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
-BUILDLINK_RECOMMENDED.qt3-tools+=	qt3-tools>=3.3.5nb3
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
+BUILDLINK_ABI_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb3
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 BUILDLINK_DEPMETHOD.qt3-tools?=	build
 .endif	# QT3_TOOLS_BUILDLINK3_MK
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 463d9a30937..3b6d8de7736 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/25 09:25:00 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-libs}
 BUILDLINK_PACKAGES+=	qt4-libs
 
 .if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index 6d3fb4d663e..6914451eb06 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/20 12:09:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_TOOLS_BUILDLINK3_MK:=	${QT4_TOOLS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nqt4-tools}
 BUILDLINK_PACKAGES+=	qt4-tools
 
 .if !empty(QT4_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
 BUILDLINK_PKGSRCDIR.qt4-tools?=	../../x11/qt4-tools
 BUILDLINK_DEPMETHOD.qt4-tools?=	build
 .endif	# QT4_TOOLS_BUILDLINK3_MK
diff --git a/x11/randrext/buildlink3.mk b/x11/randrext/buildlink3.mk
index d23b4e0dc3b..af6b58b15cf 100644
--- a/x11/randrext/buildlink3.mk
+++ b/x11/randrext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:11:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RANDREXT_BUILDLINK3_MK:=	${RANDREXT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrandrext}
 BUILDLINK_PACKAGES+=	randrext
 
 .if !empty(RANDREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
-BUILDLINK_RECOMMENDED.randrext?=	randrext>=1.0nb2
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_ABI_DEPENDS.randrext?=	randrext>=1.0nb2
 BUILDLINK_PKGSRCDIR.randrext?=	../../x11/randrext
 BUILDLINK_DEPMETHOD.randrext?=	build
 .endif	# RANDREXT_BUILDLINK3_MK
diff --git a/x11/randrext/builtin.mk b/x11/randrext/builtin.mk
index c5a26239366..a387fd53497 100644
--- a/x11/randrext/builtin.mk
+++ b/x11/randrext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILTIN_PKG:=	randrext
 
@@ -52,7 +52,7 @@ USE_BUILTIN.randrext=	${IS_BUILTIN.randrext}
 .    if defined(BUILTIN_PKG.randrext) && \
         !empty(IS_BUILTIN.randrext:M[yY][eE][sS])
 USE_BUILTIN.randrext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.randrext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.randrext}
 .        if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
 USE_BUILTIN.randrext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrext:Q}; then \
@@ -75,7 +75,7 @@ CHECK_BUILTIN.randrext?=	no
 .if !empty(CHECK_BUILTIN.randrext:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.randrext:M[nN][oO])
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
 .  endif
 
 .  if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
diff --git a/x11/renderext/buildlink3.mk b/x11/renderext/buildlink3.mk
index c795e24292d..6d236293f37 100644
--- a/x11/renderext/buildlink3.mk
+++ b/x11/renderext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/15 16:36:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 RENDEREXT_BUILDLINK3_MK:=	${RENDEREXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrenderext}
 BUILDLINK_PACKAGES+=	renderext
 
 .if !empty(RENDEREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.renderext+=	renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+=	renderext>=0.9
 BUILDLINK_PKGSRCDIR.renderext?=	../../x11/renderext
 BUILDLINK_DEPMETHOD.renderext?=	build
 .endif	# RENDEREXT_BUILDLINK3_MK
diff --git a/x11/renderext/builtin.mk b/x11/renderext/builtin.mk
index f85455cf1fb..ba8570aaba5 100644
--- a/x11/renderext/builtin.mk
+++ b/x11/renderext/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/04/06 06:23:03 reed Exp $
 
 BUILTIN_PKG:=	renderext
 
@@ -52,7 +52,7 @@ USE_BUILTIN.renderext=	${IS_BUILTIN.renderext}
 .    if defined(BUILTIN_PKG.renderext) && \
         !empty(IS_BUILTIN.renderext:M[yY][eE][sS])
 USE_BUILTIN.renderext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.renderext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.renderext}
 .        if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
 USE_BUILTIN.renderext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.renderext:Q}; then \
@@ -75,7 +75,7 @@ CHECK_BUILTIN.renderext?=	no
 .if !empty(CHECK_BUILTIN.renderext:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.renderext:M[nN][oO])
-BUILDLINK_DEPENDS.renderext+=	renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+=	renderext>=0.9
 .  endif
 
 .  if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
diff --git a/x11/startup-notification/buildlink3.mk b/x11/startup-notification/buildlink3.mk
index 2576888574e..b9a9c200a9b 100644
--- a/x11/startup-notification/buildlink3.mk
+++ b/x11/startup-notification/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 STARTUP_NOTIFICATION_BUILDLINK3_MK:=	${STARTUP_NOTIFICATION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstartup-notification}
 BUILDLINK_PACKAGES+=	startup-notification
 
 .if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.5
-BUILDLINK_RECOMMENDED.startup-notification+=	startup-notification>=0.8nb1
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.5
+BUILDLINK_ABI_DEPENDS.startup-notification+=	startup-notification>=0.8nb1
 BUILDLINK_PKGSRCDIR.startup-notification?=	../../x11/startup-notification
 .endif	# STARTUP_NOTIFICATION_BUILDLINK3_MK
 
diff --git a/x11/tk-BWidget/buildlink3.mk b/x11/tk-BWidget/buildlink3.mk
index a8ac90579df..e61bb36fedb 100644
--- a/x11/tk-BWidget/buildlink3.mk
+++ b/x11/tk-BWidget/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:04 reed Exp $
 #
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk-BWidget}
 BUILDLINK_PACKAGES+=	tk-BWidget
 
 .if !empty(TK_BWIDGET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
-BUILDLINK_RECOMMENDED.tk-BWidget?=	tk-BWidget>=1.7.0nb1
+BUILDLINK_API_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
+BUILDLINK_ABI_DEPENDS.tk-BWidget?=	tk-BWidget>=1.7.0nb1
 BUILDLINK_PKGSRCDIR.tk-BWidget?=	../../x11/tk-BWidget
 .endif	# TK_BWIDGET_BUILDLINK3_MK
 
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index ffe5414d890..adbc3c6d40e 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:03 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
 BUILDLINK_PACKAGES+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+=		tk>=8.4.6nb1
-BUILDLINK_RECOMMENDED.tk+=	tk>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+=		tk>=8.4.6nb1
+BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.4.12nb1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk=	bin/wish*
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index 460f6b664cc..6f695e6f879 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntk}
 BUILDLINK_PACKAGES+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+=		tk-8.3.4*
-BUILDLINK_RECOMMENDED.tk?=	tk>=8.3.4nb2
+BUILDLINK_API_DEPENDS.tk+=		tk-8.3.4*
+BUILDLINK_ABI_DEPENDS.tk?=	tk>=8.3.4nb2
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk83
 
 BUILDLINK_FILES.tk=	bin/wish*
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index b3f308385f9..bf4012a2364 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/30 21:18:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/06 06:23:04 reed Exp $
 #
 
 DISTNAME=	vte-0.12.0
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-ft-exec-prefix=${BUILDLINK_PREFIX.freetype2}
 PKGCONFIG_OVERRIDE+=    vte.pc.in
 
 # for FC_WIDTH
-BUILDLINK_DEPENDS.fontconfig+=      fontconfig>=2.1.93
+BUILDLINK_API_DEPENDS.fontconfig+=      fontconfig>=2.1.93
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 55730644226..538c5657774 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nvte}
 BUILDLINK_PACKAGES+=	vte
 
 .if !empty(VTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vte+=		vte>=0.11.11
-BUILDLINK_RECOMMENDED.vte+=	vte>=0.11.15nb2
+BUILDLINK_API_DEPENDS.vte+=		vte>=0.11.11
+BUILDLINK_ABI_DEPENDS.vte+=	vte>=0.11.15nb2
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
 .endif	# VTE_BUILDLINK3_MK
 
diff --git a/x11/wxGTK-contrib/buildlink3.mk b/x11/wxGTK-contrib/buildlink3.mk
index 93d9fccb91b..730733a6f51 100644
--- a/x11/wxGTK-contrib/buildlink3.mk
+++ b/x11/wxGTK-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WXGTK_CONTRIB_BUILDLINK3_MK:=	${WXGTK_CONTRIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK-contrib}
 BUILDLINK_PACKAGES+=	wxGTK-contrib
 
 .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK-contrib?=	wxGTK-contrib>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.2nb2
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK-contrib
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 8d4c4b43595..1e5fa415b96 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK}
 BUILDLINK_PACKAGES+=	wxGTK
 
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK+=	wxGTK>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK?=	wxGTK>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK?=	wxGTK>=2.6.2nb2
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 .endif	# WXGTK_BUILDLINK3_MK
 
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 81b545e8a7a..22e367b10ca 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NwxGTK24}
 BUILDLINK_PACKAGES+=	wxGTK24
 
 .if !empty(WXGTK24_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
-BUILDLINK_RECOMMENDED.wxGTK24?=	wxGTK24>=2.4.2nb9
+BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
+BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb9
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 .endif	# WXGTK24_BUILDLINK3_MK
 
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index a50437582fb..50217c9cd24 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/31 23:24:50 reed Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:04 reed Exp $
 #
 
 DISTNAME=		libXcursor-1.1.2
@@ -23,7 +23,7 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    xcursor.pc.in
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
 .include "../../x11/Xfixes/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 9996b3c0d87..1a25939ea71 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxcursor}
 BUILDLINK_PACKAGES+=	xcursor
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.0
-BUILDLINK_RECOMMENDED.xcursor+=	xcursor>=1.1.2nb1
+BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.0
+BUILDLINK_ABI_DEPENDS.xcursor+=	xcursor>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
 .endif	# XCURSOR_BUILDLINK3_MK
 
diff --git a/x11/xcursor/builtin.mk b/x11/xcursor/builtin.mk
index d29ac9b8630..df3f01f6947 100644
--- a/x11/xcursor/builtin.mk
+++ b/x11/xcursor/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
 
 BUILTIN_PKG:=	xcursor
 
@@ -57,7 +57,7 @@ USE_BUILTIN.xcursor=	${IS_BUILTIN.xcursor}
 .    if defined(BUILTIN_PKG.xcursor) && \
         !empty(IS_BUILTIN.xcursor:M[yY][eE][sS])
 USE_BUILTIN.xcursor=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xcursor}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xcursor}
 .        if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS])
 USE_BUILTIN.xcursor!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xcursor:Q}; then \
@@ -80,8 +80,8 @@ CHECK_BUILTIN.xcursor?=	no
 .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.xcursor:M[nN][oO])
-BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.1.1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .    for _mkfile_ in buildlink3.mk builtin.mk
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 .      sinclude "../../x11/Xfixes/${_mkfile_}"
diff --git a/x11/xextensions/buildlink3.mk b/x11/xextensions/buildlink3.mk
index b1e4fd4e6e1..979fee245e9 100644
--- a/x11/xextensions/buildlink3.mk
+++ b/x11/xextensions/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/08 21:57:04 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:04 reed Exp $
 #
 # This Makefile fragment is included by packages that use xextensions.
 #
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxextensions}
 BUILDLINK_PACKAGES+=	xextensions
 
 .if !empty(XEXTENSIONS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xextensions?=		xextensions>=1.0
+BUILDLINK_API_DEPENDS.xextensions?=		xextensions>=1.0
 BUILDLINK_PKGSRCDIR.xextensions?=	../../x11/xextensions
 BUILDLINK_DEPMETHOD.xextensions?=	build
 .endif # XEXTENSIONS_BUILDLINK3_MK
diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk
index 7e207fca3b1..87ee025f402 100644
--- a/x11/xextensions/builtin.mk
+++ b/x11/xextensions/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
 
 BUILTIN_PKG:=	xextensions
 
@@ -37,7 +37,7 @@ USE_BUILTIN.xextensions=	${IS_BUILTIN.xextensions}
 .    if defined(BUILTIN_PKG.xextensions) && \
         !empty(IS_BUILTIN.xextensions:M[yY][eE][sS])
 USE_BUILTIN.xextensions=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xextensions}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xextensions}
 .        if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS])
 USE_BUILTIN.xextensions!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextensions:Q}; then \
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index d521d1f5350..174f5833740 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-clipman-plugin}
 BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
 
 .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
-BUILDLINK_RECOMMENDED.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb2
+BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
+BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 .endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index e566192f9e6..229f1010740 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-desktop}
 BUILDLINK_PACKAGES+=	xfce4-desktop
 
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-desktop?=	xfce4-desktop>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-desktop?=	xfce4-desktop>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index c2cd49e591f..471314a1ad5 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-gtk2-engine}
 BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
-BUILDLINK_RECOMMENDED.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb2
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
+BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb2
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
 .endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index edd7dadb505..70c09a2124b 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-manager}
 BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index ee56d319c5a..03661222c4f 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mcs-plugins}
 BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 100f40172ba..9a9922743ad 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-notes-plugin}
 BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 
 .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
-BUILDLINK_RECOMMENDED.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb2
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
+BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index aebcc4d2284..53fa58f37b5 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
 BUILDLINK_PACKAGES+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-panel?=	xfce4-panel>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-panel?=	xfce4-panel>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index e92f4252063..78da5f03192 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:04 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-session}
 BUILDLINK_PACKAGES+=	xfce4-session
 
 .if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-session?=	xfce4-session>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-session?=	xfce4-session>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index 3424d462123..a30ea71ac63 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-taskbar-plugin}
 BUILDLINK_PACKAGES+=	xfce4-taskbar-plugin
 
 .if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
-BUILDLINK_RECOMMENDED.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb2
+BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
+BUILDLINK_ABI_DEPENDS.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?=	../../x11/xfce4-taskbar-plugin
 .endif	# XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 47415f60176..e896893fdef 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-toys}
 BUILDLINK_PACKAGES+=	xfce4-toys
 
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-toys?=	xfce4-toys>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-toys?=	xfce4-toys>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .endif	# XFCE4_TOYS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index ac6aa1318ea..2ca046ca004 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-trigger-launcher}
 BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 0dace7038f0..aefd98d4658 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/20 06:29:09 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-utils}
 BUILDLINK_PACKAGES+=	xfce4-utils
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-utils?=	xfce4-utils>=4.2.3nb3
+BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-utils?=	xfce4-utils>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index e197659ffe2..afb4cdaf9a8 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/17 06:49:26 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-windowlist-plugin}
 BUILDLINK_PACKAGES+=	xfce4-windowlist-plugin
 
 .if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
-BUILDLINK_RECOMMENDED.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb3
+BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb3
 BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?=	../../x11/xfce4-windowlist-plugin
 .endif	# XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk
index bac82ef1a85..b995c2f86f5 100644
--- a/x11/xforms/buildlink3.mk
+++ b/x11/xforms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFORMS_BUILDLINK3_MK:=	${XFORMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxforms}
 BUILDLINK_PACKAGES+=	xforms
 
 .if !empty(XFORMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xforms+=	xforms>=1.0nb2
-BUILDLINK_RECOMMENDED.xforms+=	xforms>=1.0nb5
+BUILDLINK_API_DEPENDS.xforms+=	xforms>=1.0nb2
+BUILDLINK_ABI_DEPENDS.xforms+=	xforms>=1.0nb5
 BUILDLINK_PKGSRCDIR.xforms?=	../../x11/xforms
 .endif	# XFORMS_BUILDLINK3_MK
 
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index e1c440deebb..8dcdabc53a0 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/23 23:17:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.9.0
-BUILDLINK_RECOMMENDED.xorg-libs?=	xorg-libs>=6.9.0nb2
+BUILDLINK_API_DEPENDS.xorg-libs+=		xorg-libs>=6.9.0
+BUILDLINK_ABI_DEPENDS.xorg-libs?=	xorg-libs>=6.9.0nb2
 BUILDLINK_PKGSRCDIR.xorg-libs?=		../../x11/xorg-libs
 BUILDLINK_LIBDIRS.xorg-libs?=		${X11ROOT_PREFIX}/lib
 BUILDLINK_TRANSFORM.xorg-libs+=		-e "s|/${X11ROOT_PREFIX}/|/|"
diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk
index 7e85d9df883..ff7d083d711 100644
--- a/x11/xorg-libs/builtin.mk
+++ b/x11/xorg-libs/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:23:05 reed Exp $
 
 BUILTIN_PKG:=	xorg-libs
 
@@ -43,7 +43,7 @@ USE_BUILTIN.xorg-libs=	${IS_BUILTIN.xorg-libs}
 .    if defined(BUILTIN_PKG.xorg-libs) && \
         !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS])
 USE_BUILTIN.xorg-libs=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xorg-libs}
 .        if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS])
 USE_BUILTIN.xorg-libs!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \
diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk
index 0c835d3f9a0..99942c73238 100644
--- a/x11/xosd/buildlink3.mk
+++ b/x11/xosd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:11:48 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XOSD_BUILDLINK3_MK:=	${XOSD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxosd}
 BUILDLINK_PACKAGES+=	xosd
 
 .if !empty(XOSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xosd+=	xosd>=2.2.12
-BUILDLINK_RECOMMENDED.xosd+=	xosd>=2.2.12nb2
+BUILDLINK_API_DEPENDS.xosd+=	xosd>=2.2.12
+BUILDLINK_ABI_DEPENDS.xosd+=	xosd>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.xosd?=	../../x11/xosd
 .endif	# XOSD_BUILDLINK3_MK
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index dd1eece6c3f..64299fcfe10 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.85 2005/12/05 20:51:20 rillig Exp $
+# $NetBSD: Makefile.common,v 1.86 2006/04/06 06:23:05 reed Exp $
 #
 
 DISTNAME=		xscreensaver-4.22
@@ -10,7 +10,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 BUILD_USES_MSGFMT=	yes
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.2
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0.2
 
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/x11/xscreensaver/buildlink3.mk b/x11/xscreensaver/buildlink3.mk
index 8754c9b360b..a8d2279bbd6 100644
--- a/x11/xscreensaver/buildlink3.mk
+++ b/x11/xscreensaver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XSCREENSAVER_BUILDLINK3_MK:=	${XSCREENSAVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxscreensaver}
 BUILDLINK_PACKAGES+=	xscreensaver
 
 .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xscreensaver+=	xscreensaver>=4.14
-BUILDLINK_RECOMMENDED.xscreensaver?=	xscreensaver>=4.22nb3
+BUILDLINK_API_DEPENDS.xscreensaver+=	xscreensaver>=4.14
+BUILDLINK_ABI_DEPENDS.xscreensaver?=	xscreensaver>=4.22nb3
 BUILDLINK_PKGSRCDIR.xscreensaver?=	../../x11/xscreensaver
 .endif	# XSCREENSAVER_BUILDLINK3_MK
 
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
index a3f56f7a54a..88f536086c2 100644
--- a/x11/xview-lib/buildlink3.mk
+++ b/x11/xview-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:23:05 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XVIEW_LIB_BUILDLINK3_MK:=	${XVIEW_LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxview-lib}
 BUILDLINK_PACKAGES+=	xview-lib
 
 .if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xview-lib+=	xview-lib>=3.2.1
-BUILDLINK_RECOMMENDED.xview-lib?=	xview-lib>=3.2.1nb6
+BUILDLINK_API_DEPENDS.xview-lib+=	xview-lib>=3.2.1
+BUILDLINK_ABI_DEPENDS.xview-lib?=	xview-lib>=3.2.1nb6
 BUILDLINK_PKGSRCDIR.xview-lib?=	../../x11/xview-lib
 .endif	# XVIEW_LIB_BUILDLINK3_MK
 
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 8443c4c2c24..c05b10916cf 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/03/30 21:22:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:23:05 reed Exp $
 #
 
 DISTNAME=	zenity-2.14.0
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-- 
cgit v1.2.3