summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/GConf/buildlink3.mk6
-rw-r--r--devel/GConf2-ui/Makefile4
-rw-r--r--devel/GConf2-ui/buildlink3.mk6
-rw-r--r--devel/GConf2/Makefile.common4
-rw-r--r--devel/GConf2/buildlink3.mk6
-rw-r--r--devel/Gorm/Makefile6
-rw-r--r--devel/Renaissance/buildlink3.mk6
-rw-r--r--devel/SDL/buildlink3.mk6
-rw-r--r--devel/SDL_gfx/buildlink3.mk6
-rw-r--r--devel/SDL_ttf/buildlink3.mk6
-rw-r--r--devel/SDLmm/buildlink3.mk6
-rw-r--r--devel/allegro/buildlink3.mk6
-rw-r--r--devel/apr/buildlink3.mk6
-rw-r--r--devel/at-spi/buildlink3.mk6
-rw-r--r--devel/atk/Makefile4
-rw-r--r--devel/atk/buildlink3.mk6
-rw-r--r--devel/bglibs/buildlink3.mk4
-rw-r--r--devel/binutils/buildlink3.mk4
-rw-r--r--devel/binutils/builtin.mk4
-rw-r--r--devel/blib/buildlink3.mk6
-rw-r--r--devel/boehm-gc/buildlink3.mk6
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/bonobo/buildlink3.mk6
-rw-r--r--devel/boost-build/buildlink3.mk4
-rw-r--r--devel/boost-headers/buildlink3.mk4
-rw-r--r--devel/boost-libs/buildlink3.mk4
-rw-r--r--devel/boost-python/buildlink3.mk6
-rw-r--r--devel/buddy/buildlink3.mk4
-rw-r--r--devel/buildtool/buildlink3.mk4
-rw-r--r--devel/cdk/buildlink3.mk6
-rw-r--r--devel/cdk/builtin.mk4
-rw-r--r--devel/chmlib/buildlink3.mk6
-rw-r--r--devel/cmake/buildlink3.mk6
-rw-r--r--devel/cppunit/buildlink3.mk6
-rw-r--r--devel/darts/buildlink3.mk4
-rw-r--r--devel/devIL/buildlink3.mk6
-rw-r--r--devel/dlcompat/buildlink3.mk4
-rw-r--r--devel/dlcompat/builtin.mk4
-rw-r--r--devel/dmalloc/buildlink3.mk4
-rw-r--r--devel/edcommon/buildlink3.mk6
-rw-r--r--devel/eel2/buildlink3.mk6
-rw-r--r--devel/eet/buildlink3.mk4
-rw-r--r--devel/ffcall/buildlink3.mk6
-rw-r--r--devel/flex/buildlink3.mk4
-rw-r--r--devel/florist/buildlink3.mk6
-rw-r--r--devel/g-wrap/buildlink3.mk6
-rw-r--r--devel/g-wrap1/buildlink3.mk8
-rw-r--r--devel/gail/buildlink3.mk6
-rw-r--r--devel/gal/buildlink3.mk6
-rw-r--r--devel/gconfmm/buildlink3.mk6
-rw-r--r--devel/gdbada/buildlink3.mk6
-rw-r--r--devel/gettext-asprintf/buildlink3.mk4
-rw-r--r--devel/gettext-lib/buildlink3.mk4
-rw-r--r--devel/gettext-lib/builtin.mk8
-rw-r--r--devel/gettext-tools/Makefile4
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/giblib/buildlink3.mk6
-rw-r--r--devel/glib/buildlink3.mk6
-rw-r--r--devel/glib2/buildlink3.mk6
-rw-r--r--devel/glibmm/Makefile4
-rw-r--r--devel/glibmm/buildlink3.mk6
-rw-r--r--devel/gmp/buildlink3.mk6
-rw-r--r--devel/gnustep-base/buildlink3.mk6
-rw-r--r--devel/gnustep-make/buildlink3.mk6
-rw-r--r--devel/gnustep-objc-lf2/buildlink3.mk6
-rw-r--r--devel/gnustep-objc/buildlink3.mk6
-rw-r--r--devel/gob2/buildlink3.mk6
-rw-r--r--devel/gperf/buildlink3.mk4
-rw-r--r--devel/gtl/buildlink3.mk4
-rw-r--r--devel/guile-gtk/buildlink3.mk6
-rw-r--r--devel/guile14-gtk/buildlink3.mk6
-rw-r--r--devel/hdf/buildlink3.mk6
-rw-r--r--devel/hdf5/buildlink3.mk6
-rw-r--r--devel/kdesdk3/buildlink3.mk6
-rw-r--r--devel/ldapsdk/buildlink3.mk6
-rw-r--r--devel/libFoundation/buildlink3.mk6
-rw-r--r--devel/libargparse/buildlink3.mk6
-rw-r--r--devel/libast/buildlink3.mk6
-rw-r--r--devel/libaura/buildlink3.mk4
-rw-r--r--devel/libbegemot/buildlink3.mk4
-rw-r--r--devel/libbonobo/buildlink3.mk6
-rw-r--r--devel/libbonoboui/Makefile6
-rw-r--r--devel/libbonoboui/buildlink3.mk6
-rw-r--r--devel/libcfg+/buildlink3.mk6
-rw-r--r--devel/libdfui/buildlink3.mk4
-rw-r--r--devel/libdnsres/Makefile4
-rw-r--r--devel/libdnsres/buildlink3.mk4
-rw-r--r--devel/libdockapp/buildlink3.mk6
-rw-r--r--devel/libebml/buildlink3.mk6
-rw-r--r--devel/libelf/buildlink3.mk4
-rw-r--r--devel/libetm/buildlink3.mk4
-rw-r--r--devel/libevent/buildlink3.mk4
-rw-r--r--devel/libevent/builtin.mk4
-rw-r--r--devel/libextractor/buildlink3.mk6
-rw-r--r--devel/libffi/buildlink3.mk6
-rw-r--r--devel/libgail-gnome/buildlink3.mk6
-rw-r--r--devel/libgetopt/buildlink3.mk4
-rw-r--r--devel/libgetopt/builtin.mk4
-rw-r--r--devel/libglade/buildlink3.mk6
-rw-r--r--devel/libglade2/Makefile8
-rw-r--r--devel/libglade2/buildlink3.mk6
-rw-r--r--devel/libglademm/buildlink3.mk6
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--devel/libgnome/buildlink3.mk6
-rw-r--r--devel/libgnomemm/buildlink3.mk6
-rw-r--r--devel/libgnomeui/Makefile8
-rw-r--r--devel/libgnomeui/buildlink3.mk6
-rw-r--r--devel/libgnomeuimm/buildlink3.mk6
-rw-r--r--devel/libgphoto2/buildlink3.mk6
-rw-r--r--devel/libgsf/buildlink3.mk6
-rw-r--r--devel/libhfs/buildlink3.mk4
-rw-r--r--devel/libiberty/buildlink3.mk6
-rw-r--r--devel/libidn/buildlink3.mk6
-rw-r--r--devel/libinstaller/buildlink3.mk4
-rw-r--r--devel/libjit/buildlink3.mk6
-rw-r--r--devel/libltdl/buildlink3.mk4
-rw-r--r--devel/libmatchbox/buildlink3.mk6
-rw-r--r--devel/libmemcache/buildlink3.mk4
-rw-r--r--devel/libmemmgr/buildlink3.mk4
-rw-r--r--devel/libmimedir/buildlink3.mk4
-rw-r--r--devel/libmm/buildlink3.mk6
-rw-r--r--devel/libnet/buildlink3.mk6
-rw-r--r--devel/libnet11/buildlink3.mk4
-rw-r--r--devel/libntlm/buildlink3.mk6
-rw-r--r--devel/liboil/buildlink3.mk4
-rw-r--r--devel/libole2/buildlink3.mk6
-rw-r--r--devel/liboop/buildlink3.mk6
-rw-r--r--devel/libosip/buildlink3.mk6
-rw-r--r--devel/libportlib/buildlink3.mk4
-rw-r--r--devel/libproplist/buildlink3.mk6
-rw-r--r--devel/librfuncs/buildlink3.mk4
-rw-r--r--devel/librsync/buildlink3.mk6
-rw-r--r--devel/libscsi/buildlink3.mk4
-rw-r--r--devel/libsigc++/buildlink3.mk6
-rw-r--r--devel/libsigc++2/buildlink3.mk6
-rw-r--r--devel/libsigsegv/buildlink3.mk4
-rw-r--r--devel/libslang/buildlink3.mk6
-rw-r--r--devel/libstatgrab/buildlink3.mk6
-rw-r--r--devel/libstroke/buildlink3.mk6
-rw-r--r--devel/libtar/buildlink3.mk4
-rw-r--r--devel/libtecla/buildlink3.mk6
-rw-r--r--devel/libts/buildlink3.mk4
-rw-r--r--devel/libusb/buildlink3.mk6
-rw-r--r--devel/libwnck/buildlink3.mk6
-rw-r--r--devel/lwp/buildlink3.mk6
-rw-r--r--devel/nbitools/buildlink3.mk4
-rw-r--r--devel/ncurses/buildlink3.mk6
-rw-r--r--devel/ncurses/builtin.mk4
-rw-r--r--devel/netcdf/buildlink3.mk6
-rw-r--r--devel/newt/buildlink3.mk6
-rw-r--r--devel/nspr/buildlink3.mk6
-rw-r--r--devel/nss/Makefile4
-rw-r--r--devel/nss/buildlink3.mk6
-rw-r--r--devel/oaf/buildlink3.mk6
-rw-r--r--devel/ode/buildlink3.mk6
-rw-r--r--devel/ogre/buildlink3.mk6
-rw-r--r--devel/p5-glib2/buildlink3.mk6
-rw-r--r--devel/pango/Makefile6
-rw-r--r--devel/pango/buildlink3.mk6
-rw-r--r--devel/pccts/buildlink3.mk6
-rw-r--r--devel/pcre++/buildlink3.mk4
-rw-r--r--devel/pcre/buildlink3.mk6
-rw-r--r--devel/physfs/buildlink3.mk6
-rw-r--r--devel/popt/buildlink3.mk6
-rw-r--r--devel/pth/buildlink3.mk6
-rw-r--r--devel/pthread-sem/buildlink3.mk4
-rw-r--r--devel/pthread-stublib/buildlink3.mk4
-rw-r--r--devel/pwlib/buildlink3.mk6
-rw-r--r--devel/py-curses/Makefile4
-rw-r--r--devel/py-curses/buildlink3.mk6
-rw-r--r--devel/py-cursespanel/buildlink3.mk6
-rw-r--r--devel/py-game/buildlink3.mk6
-rw-r--r--devel/py-gobject/buildlink3.mk4
-rw-r--r--devel/py-readline/buildlink3.mk6
-rw-r--r--devel/readline/buildlink3.mk6
-rw-r--r--devel/readline/builtin.mk4
-rw-r--r--devel/rpc2/buildlink3.mk6
-rw-r--r--devel/ruby-gnome2-pango/buildlink3.mk6
-rw-r--r--devel/rudiments/buildlink3.mk6
-rw-r--r--devel/rvm/buildlink3.mk6
-rw-r--r--devel/rx/buildlink3.mk4
-rw-r--r--devel/silc-toolkit/buildlink3.mk6
-rw-r--r--devel/subversion-base/Makefile6
-rw-r--r--devel/subversion-base/buildlink3.mk6
-rw-r--r--devel/subversion/Makefile.common4
-rw-r--r--devel/swig/buildlink3.mk6
-rw-r--r--devel/syncdir/buildlink3.mk6
-rw-r--r--devel/sysexits/buildlink3.mk4
-rw-r--r--devel/sysexits/builtin.mk4
-rw-r--r--devel/tcl-tclcl/buildlink3.mk6
-rw-r--r--devel/teem/buildlink3.mk6
-rw-r--r--devel/tre/buildlink3.mk4
-rw-r--r--devel/ucl/buildlink3.mk6
-rw-r--r--devel/vanessa_adt/buildlink3.mk6
-rw-r--r--devel/vanessa_logger/buildlink3.mk6
-rw-r--r--devel/vanessa_socket/buildlink3.mk6
-rw-r--r--devel/zlib/buildlink3.mk6
-rw-r--r--devel/zlib/builtin.mk4
198 files changed, 531 insertions, 531 deletions
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 796f2fa5eec..68849b11d36 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf}
BUILDLINK_PACKAGES+= GConf
.if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf+= GConf>=1.0.9nb7
-BUILDLINK_RECOMMENDED.GConf?= GConf>=1.0.9nb8
+BUILDLINK_API_DEPENDS.GConf+= GConf>=1.0.9nb7
+BUILDLINK_ABI_DEPENDS.GConf?= GConf>=1.0.9nb8
BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
.endif # GCONF_BUILDLINK3_MK
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 3da14a8b159..c7043fd6016 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:21:43 reed Exp $
#
.include "../../devel/GConf2/Makefile.common"
PKGNAME= ${DISTNAME:S/GConf/GConf2-ui/}
-BUILDLINK_DEPENDS.GConf2+= GConf2>=${GCONF2_VERSION}
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=${GCONF2_VERSION}
CONFIGURE_ARGS+= --enable-gtk
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
index d59d9acec03..78afb64d838 100644
--- a/devel/GConf2-ui/buildlink3.mk
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_UI_BUILDLINK3_MK:= ${GCONF2_UI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2-ui}
BUILDLINK_PACKAGES+= GConf2-ui
.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2-ui?= GConf2-ui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.GConf2-ui+= GConf2-ui>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2-ui?= GConf2-ui>=2.12.1nb2
BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
.endif # GCONF2_UI_BUILDLINK3_MK
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index b66e2f31f5f..847881ed68c 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2006/03/30 20:50:02 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.38 2006/04/06 06:21:43 reed Exp $
#
GCONF2_VERSION= 2.14.0
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
-BUILDLINK_DEPENDS.glib2+= glib2>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
index c2c2066dfc3..5775f1ae15e 100644
--- a/devel/GConf2/buildlink3.mk
+++ b/devel/GConf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf2}
BUILDLINK_PACKAGES+= GConf2
.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2?= GConf2>=2.12.1nb1
+BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2?= GConf2>=2.12.1nb1
BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
.endif # GCONF2_BUILDLINK3_MK
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 0ee6c7c62f7..3aa17dda2f6 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:21:43 reed Exp $
DISTNAME= Gorm-1.0.4
PKGREVISION= 1
@@ -9,8 +9,8 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Graphical user interface builder for GNUstep
-BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>=1.11.1
-BUILDLINK_DEPENDS.gnustep-gui+= gnustep-gui>=0.10.1
+BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.11.1
+BUILDLINK_API_DEPENDS.gnustep-gui+= gnustep-gui>=0.10.1
NO_CONFIGURE= yes
diff --git a/devel/Renaissance/buildlink3.mk b/devel/Renaissance/buildlink3.mk
index 3099d5d48bd..515138f751c 100644
--- a/devel/Renaissance/buildlink3.mk
+++ b/devel/Renaissance/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RENAISSANCE_BUILDLINK3_MK:= ${RENAISSANCE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenaissance}
BUILDLINK_PACKAGES+= Renaissance
.if !empty(RENAISSANCE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Renaissance+= Renaissance>=0.7.0
-BUILDLINK_RECOMMENDED.Renaissance+= Renaissance>=0.8.0nb4
+BUILDLINK_API_DEPENDS.Renaissance+= Renaissance>=0.7.0
+BUILDLINK_ABI_DEPENDS.Renaissance+= Renaissance>=0.8.0nb4
BUILDLINK_PKGSRCDIR.Renaissance?= ../../devel/Renaissance
.endif # RENAISSANCE_BUILDLINK3_MK
diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index bd678a6a26b..c60c3722f25 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:43 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL}
BUILDLINK_PACKAGES+= SDL
.if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb5
-BUILDLINK_RECOMMENDED.SDL+= SDL>=1.2.9nb2
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
+BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.9nb2
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
.endif # SDL_BUILDLINK3_MK
diff --git a/devel/SDL_gfx/buildlink3.mk b/devel/SDL_gfx/buildlink3.mk
index 3d44772b918..d756c0e8669 100644
--- a/devel/SDL_gfx/buildlink3.mk
+++ b/devel/SDL_gfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_GFX_BUILDLINK3_MK:= ${SDL_GFX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_gfx}
BUILDLINK_PACKAGES+= SDL_gfx
.if !empty(SDL_GFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2
-BUILDLINK_RECOMMENDED.SDL_gfx?= SDL_gfx>=2.0.13nb3
+BUILDLINK_API_DEPENDS.SDL_gfx+= SDL_gfx>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.SDL_gfx?= SDL_gfx>=2.0.13nb3
BUILDLINK_PKGSRCDIR.SDL_gfx?= ../../devel/SDL_gfx
.endif # SDL_GFX_BUILDLINK3_MK
diff --git a/devel/SDL_ttf/buildlink3.mk b/devel/SDL_ttf/buildlink3.mk
index ddcf61a92fa..ed02fa61096 100644
--- a/devel/SDL_ttf/buildlink3.mk
+++ b/devel/SDL_ttf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/06 23:16:07 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_TTF_BUILDLINK3_MK:= ${SDL_TTF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_ttf}
BUILDLINK_PACKAGES+= SDL_ttf
.if !empty(SDL_TTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3
-BUILDLINK_RECOMMENDED.SDL_ttf?= SDL_ttf>=2.0.7nb3
+BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.3nb3
+BUILDLINK_ABI_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.7nb3
BUILDLINK_PKGSRCDIR.SDL_ttf?= ../../devel/SDL_ttf
.endif # SDL_TTF_BUILDLINK3_MK
diff --git a/devel/SDLmm/buildlink3.mk b/devel/SDLmm/buildlink3.mk
index e2e40fb0a45..153638d5569 100644
--- a/devel/SDLmm/buildlink3.mk
+++ b/devel/SDLmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDLMM_BUILDLINK3_MK:= ${SDLMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLmm}
BUILDLINK_PACKAGES+= SDLmm
.if !empty(SDLMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1
-BUILDLINK_RECOMMENDED.SDLmm?= SDLmm>=0.1.8nb5
+BUILDLINK_API_DEPENDS.SDLmm+= SDLmm>=0.1.8nb1
+BUILDLINK_ABI_DEPENDS.SDLmm?= SDLmm>=0.1.8nb5
BUILDLINK_PKGSRCDIR.SDLmm?= ../../devel/SDLmm
.endif # SDLMM_BUILDLINK3_MK
diff --git a/devel/allegro/buildlink3.mk b/devel/allegro/buildlink3.mk
index 50939834a6f..5a3d3332d26 100644
--- a/devel/allegro/buildlink3.mk
+++ b/devel/allegro/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ALLEGRO_BUILDLINK3_MK:= ${ALLEGRO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nallegro}
BUILDLINK_PACKAGES+= allegro
.if !empty(ALLEGRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.allegro+= allegro>=4.1.13
-BUILDLINK_RECOMMENDED.allegro?= allegro>=4.2.0nb1
+BUILDLINK_API_DEPENDS.allegro+= allegro>=4.1.13
+BUILDLINK_ABI_DEPENDS.allegro?= allegro>=4.2.0nb1
BUILDLINK_PKGSRCDIR.allegro?= ../../devel/allegro
.endif # ALLEGRO_BUILDLINK3_MK
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 36c1d1399b4..1e0b5242506 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr}
BUILDLINK_PACKAGES+= apr
.if !empty(APR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1
-BUILDLINK_RECOMMENDED.apr+= apr>=0.9.7.2.0.55nb2
+BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5.2.0.51nb1
+BUILDLINK_ABI_DEPENDS.apr+= apr>=0.9.7.2.0.55nb2
BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr
WRAPPER_REORDER_CMDS+= reorder:l:aprutil-0:crypt
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index 73b6e468056..218c1c818df 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nat-spi}
BUILDLINK_PACKAGES+= at-spi
.if !empty(AT_SPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.at-spi+= at-spi>=1.6.0
-BUILDLINK_RECOMMENDED.at-spi+= at-spi>=1.6.6nb2
+BUILDLINK_API_DEPENDS.at-spi+= at-spi>=1.6.0
+BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.6.6nb2
BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi
.endif # AT_SPI_BUILDLINK3_MK
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 0851e42cdc1..5a7a7bd5298 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/02 17:47:54 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/04/06 06:21:44 reed Exp $
#
DISTNAME= atk-1.11.4
@@ -27,7 +27,7 @@ CONFIGURE_ENV+= F77=${FALSE:Q}
# glib-mkenums overflows a 2048kb stack on atkobject.h
UNLIMIT_RESOURCES= stacksize
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk
index 7159c284ed3..bb9c9647abf 100644
--- a/devel/atk/buildlink3.mk
+++ b/devel/atk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Natk}
BUILDLINK_PACKAGES+= atk
.if !empty(ATK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.atk+= atk>=1.8.0
-BUILDLINK_RECOMMENDED.atk+= atk>=1.10.3nb1
+BUILDLINK_API_DEPENDS.atk+= atk>=1.8.0
+BUILDLINK_ABI_DEPENDS.atk+= atk>=1.10.3nb1
BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk
.endif # ATK_BUILDLINK3_MK
diff --git a/devel/bglibs/buildlink3.mk b/devel/bglibs/buildlink3.mk
index 59c8b09f407..50b35f97bec 100644
--- a/devel/bglibs/buildlink3.mk
+++ b/devel/bglibs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/20 02:59:52 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BGLIBS_BUILDLINK3_MK:= ${BGLIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbglibs}
BUILDLINK_PACKAGES+= bglibs
.if !empty(BGLIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bglibs+= bglibs>=1.040
+BUILDLINK_API_DEPENDS.bglibs+= bglibs>=1.040
BUILDLINK_PKGSRCDIR.bglibs?= ../../devel/bglibs
BUILDLINK_DEPMETHOD.bglibs?= build
.endif # BGLIBS_BUILDLINK3_MK
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 69211144c9a..a31733bcba8 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/06/30 16:18:03 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:21:44 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbinutils}
BUILDLINK_PACKAGES+= binutils
.if !empty(BINUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.binutils+= binutils>=2.15.0
+BUILDLINK_API_DEPENDS.binutils+= binutils>=2.15.0
BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils
BUILDLINK_DEPMETHOD.binutils?= build
.endif # BINUTILS_BUILDLINK3_MK
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index d5c9cbded2c..82926dfc012 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:44 reed Exp $
BUILTIN_PKG:= binutils
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -22,7 +22,7 @@ USE_BUILTIN.binutils= ${IS_BUILTIN.binutils}
. if defined(BUILTIN_PKG.binutils) && \
!empty(IS_BUILTIN.binutils:M[yY][eE][sS])
USE_BUILTIN.binutils= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.binutils}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.binutils}
. if !empty(USE_BUILTIN.binutils:M[yY][eE][sS])
USE_BUILTIN.binutils!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.binutils:Q}; then \
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 31e5538455c..bedebbde9da 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BLIB_BUILDLINK3_MK:= ${BLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nblib}
BUILDLINK_PACKAGES+= blib
.if !empty(BLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blib+= blib>=1.0.2nb1
-BUILDLINK_RECOMMENDED.blib+= blib>=1.0.2nb4
+BUILDLINK_API_DEPENDS.blib+= blib>=1.0.2nb1
+BUILDLINK_ABI_DEPENDS.blib+= blib>=1.0.2nb4
BUILDLINK_PKGSRCDIR.blib?= ../../devel/blib
.endif # BLIB_BUILDLINK3_MK
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index d04fc592489..b5c1f448046 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOEHM_GC_BUILDLINK3_MK:= ${BOEHM_GC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboehm-gc}
BUILDLINK_PACKAGES+= boehm-gc
.if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.3nb1
-BUILDLINK_RECOMMENDED.boehm-gc+= boehm-gc>=6.6nb1
+BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.3nb1
+BUILDLINK_ABI_DEPENDS.boehm-gc+= boehm-gc>=6.6nb1
BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc
.endif # BOEHM_GC_BUILDLINK3_MK
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 2f0baf31872..5505d81d504 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:21:45 reed Exp $
DISTNAME= bonobo-1.0.22
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Architecture for creating reusable software components
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-BUILDLINK_DEPENDS.libxml= libxml>1.8.15
+BUILDLINK_API_DEPENDS.libxml= libxml>1.8.15
BROKEN_GETTEXT_DETECTION= yes
BUILD_USES_MSGFMT= yes
diff --git a/devel/bonobo/buildlink3.mk b/devel/bonobo/buildlink3.mk
index e36bc7b0bac..358ab5e4e2f 100644
--- a/devel/bonobo/buildlink3.mk
+++ b/devel/bonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BONOBO_BUILDLINK3_MK:= ${BONOBO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbonobo}
BUILDLINK_PACKAGES+= bonobo
.if !empty(BONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bonobo+= bonobo>=1.0.18nb7
-BUILDLINK_RECOMMENDED.bonobo+= bonobo>=1.0.22nb1
+BUILDLINK_API_DEPENDS.bonobo+= bonobo>=1.0.18nb7
+BUILDLINK_ABI_DEPENDS.bonobo+= bonobo>=1.0.22nb1
BUILDLINK_PKGSRCDIR.bonobo?= ../../devel/bonobo
.endif # BONOBO_BUILDLINK3_MK
diff --git a/devel/boost-build/buildlink3.mk b/devel/boost-build/buildlink3.mk
index f2c97cda5a2..2901f2a801d 100644
--- a/devel/boost-build/buildlink3.mk
+++ b/devel/boost-build/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/09/22 22:06:08 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_BUILD_BUILDLINK3_MK:= ${BOOST_BUILD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nboost-build}
BUILDLINK_PACKAGES+= boost-build
.if !empty(BOOST_BUILD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boost-build+= boost-build-1.33.*
+BUILDLINK_API_DEPENDS.boost-build+= boost-build-1.33.*
BUILDLINK_DEPMETHOD.boost-build?= build
BUILDLINK_PKGSRCDIR.boost-build?= ../../devel/boost-build
.endif # BOOST_BUILD_BUILDLINK3_MK
diff --git a/devel/boost-headers/buildlink3.mk b/devel/boost-headers/buildlink3.mk
index 7aa55ee276e..ebc7804af78 100644
--- a/devel/boost-headers/buildlink3.mk
+++ b/devel/boost-headers/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/12 20:58:45 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_HEADERS_BUILDLINK3_MK:= ${BOOST_HEADERS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= boost-headers
.if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-headers+= boost-headers-1.33.*
+BUILDLINK_API_DEPENDS.boost-headers+= boost-headers-1.33.*
BUILDLINK_DEPMETHOD.boost-headers?= build
BUILDLINK_PKGSRCDIR.boost-headers?= ../../devel/boost-headers
.endif # BOOST_HEADERS_BUILDLINK3_MK
diff --git a/devel/boost-libs/buildlink3.mk b/devel/boost-libs/buildlink3.mk
index 4c4463fc7b4..4498ce08452 100644
--- a/devel/boost-libs/buildlink3.mk
+++ b/devel/boost-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/12 20:58:45 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_LIBS_BUILDLINK3_MK:= ${BOOST_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= boost-libs
.if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-libs+= boost-libs-1.33.*
+BUILDLINK_API_DEPENDS.boost-libs+= boost-libs-1.33.*
BUILDLINK_PKGSRCDIR.boost-libs?= ../../devel/boost-libs
.endif # BOOST_LIBS_BUILDLINK3_MK
diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk
index 073192f25af..54415039318 100644
--- a/devel/boost-python/buildlink3.mk
+++ b/devel/boost-python/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:45 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BOOST_PYTHON_BUILDLINK3_MK:= ${BOOST_PYTHON_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+= boost-python
.if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-python+= boost-python-1.33.*
-BUILDLINK_RECOMMENDED.boost-python?= boost-python>=1.33.1nb1
+BUILDLINK_API_DEPENDS.boost-python+= boost-python-1.33.*
+BUILDLINK_ABI_DEPENDS.boost-python?= boost-python>=1.33.1nb1
BUILDLINK_PKGSRCDIR.boost-python?= ../../devel/boost-python
.include "../../devel/boost-headers/buildlink3.mk"
diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk
index cfb22608912..c68147893c2 100644
--- a/devel/buddy/buildlink3.mk
+++ b/devel/buddy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/14 20:23:07 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUDDY_BUILDLINK3_MK:= ${BUDDY_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbuddy}
BUILDLINK_PACKAGES+= buddy
.if !empty(BUDDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buddy+= buddy>=2.4
+BUILDLINK_API_DEPENDS.buddy+= buddy>=2.4
BUILDLINK_PKGSRCDIR.buddy?= ../../devel/buddy
.endif # BUDDY_BUILDLINK3_MK
diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk
index 3be21ffb927..e4b4e89358e 100644
--- a/devel/buildtool/buildlink3.mk
+++ b/devel/buildtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 23:55:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:46 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbuildtool}
BUILDLINK_PACKAGES+= buildtool
.if !empty(BUILDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buildtool+= buildtool>=0.16
+BUILDLINK_API_DEPENDS.buildtool+= buildtool>=0.16
BUILDLINK_PKGSRCDIR.buildtool?= ../../devel/buildtool
BUILDLINK_DEPMETHOD.buildtool?= build
diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk
index a30c40af5f4..6f70e3d7f29 100644
--- a/devel/cdk/buildlink3.mk
+++ b/devel/cdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:25 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CDK_BUILDLINK3_MK:= ${CDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncdk}
BUILDLINK_PACKAGES+= cdk
.if !empty(CDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdk+= cdk>=4.9.9nb1
-BUILDLINK_RECOMMENDED.cdk+= cdk>=4.9.9nb2
+BUILDLINK_API_DEPENDS.cdk+= cdk>=4.9.9nb1
+BUILDLINK_ABI_DEPENDS.cdk+= cdk>=4.9.9nb2
BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk
.endif # CDK_BUILDLINK3_MK
diff --git a/devel/cdk/builtin.mk b/devel/cdk/builtin.mk
index 372d0a1e650..145e3e7bd53 100644
--- a/devel/cdk/builtin.mk
+++ b/devel/cdk/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:47 reed Exp $
BUILTIN_PKG:= cdk
@@ -31,7 +31,7 @@ USE_BUILTIN.cdk= ${IS_BUILTIN.cdk}
. if defined(BUILTIN_PKG.cdk) && \
!empty(IS_BUILTIN.cdk:M[yY][eE][sS])
USE_BUILTIN.cdk= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.cdk}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.cdk}
. if !empty(USE_BUILTIN.cdk:M[yY][eE][sS])
USE_BUILTIN.cdk!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then \
diff --git a/devel/chmlib/buildlink3.mk b/devel/chmlib/buildlink3.mk
index 1ca7f62d0d1..0712a9f93af 100644
--- a/devel/chmlib/buildlink3.mk
+++ b/devel/chmlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CHMLIB_BUILDLINK3_MK:= ${CHMLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nchmlib}
BUILDLINK_PACKAGES+= chmlib
.if !empty(CHMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chmlib+= chmlib>=0.31
-BUILDLINK_RECOMMENDED.chmlib+= chmlib>=0.37.4nb2
+BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.31
+BUILDLINK_ABI_DEPENDS.chmlib+= chmlib>=0.37.4nb2
BUILDLINK_PKGSRCDIR.chmlib?= ../../devel/chmlib
.endif # CHMLIB_BUILDLINK3_MK
diff --git a/devel/cmake/buildlink3.mk b/devel/cmake/buildlink3.mk
index 6fb42767a26..1bfdc6ad7d1 100644
--- a/devel/cmake/buildlink3.mk
+++ b/devel/cmake/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CMAKE_BUILDLINK3_MK:= ${CMAKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncmake}
BUILDLINK_PACKAGES+= cmake
.if !empty(CMAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cmake+= cmake>=2.0.2
-BUILDLINK_RECOMMENDED.cmake?= cmake>=2.0.5nb2
+BUILDLINK_API_DEPENDS.cmake+= cmake>=2.0.2
+BUILDLINK_ABI_DEPENDS.cmake?= cmake>=2.0.5nb2
BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake
BUILDLINK_DEPMETHOD.cmake?= build
.endif # CMAKE_BUILDLINK3_MK
diff --git a/devel/cppunit/buildlink3.mk b/devel/cppunit/buildlink3.mk
index a513e6942fa..cdcecab8a47 100644
--- a/devel/cppunit/buildlink3.mk
+++ b/devel/cppunit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CPPUNIT_BUILDLINK3_MK:= ${CPPUNIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncppunit}
BUILDLINK_PACKAGES+= cppunit
.if !empty(CPPUNIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cppunit+= cppunit>=1.10.2
-BUILDLINK_RECOMMENDED.cppunit?= cppunit>=1.10.2nb5
+BUILDLINK_API_DEPENDS.cppunit+= cppunit>=1.10.2
+BUILDLINK_ABI_DEPENDS.cppunit?= cppunit>=1.10.2nb5
BUILDLINK_PKGSRCDIR.cppunit?= ../../devel/cppunit
BUILDLINK_CPPFLAGS.cppunit+= -I${BUILDLINK_PREFIX.cppunit}/include/cppunit
.endif # CPPUNIT_BUILDLINK3_MK
diff --git a/devel/darts/buildlink3.mk b/devel/darts/buildlink3.mk
index dfd9b4129c7..363737ded91 100644
--- a/devel/darts/buildlink3.mk
+++ b/devel/darts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/05/08 21:34:43 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:47 reed Exp $
BUILDLINK_DEPMETHOD.darts?= build
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndarts}
BUILDLINK_PACKAGES+= darts
.if !empty(DARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.darts+= darts>=0.2
+BUILDLINK_API_DEPENDS.darts+= darts>=0.2
BUILDLINK_PKGSRCDIR.darts?= ../../devel/darts
.endif # DARTS_BUILDLINK3_MK
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index c73c57f2074..cf9e206d7af 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DEVIL_BUILDLINK3_MK:= ${DEVIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NdevIL}
BUILDLINK_PACKAGES+= devIL
.if !empty(DEVIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.devIL+= devIL>=1.6.6nb1
-BUILDLINK_RECOMMENDED.devIL+= devIL>=1.6.6nb6
+BUILDLINK_API_DEPENDS.devIL+= devIL>=1.6.6nb1
+BUILDLINK_ABI_DEPENDS.devIL+= devIL>=1.6.6nb6
BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL
.endif # DEVIL_BUILDLINK3_MK
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index 653b550f9f4..9cc91428df4 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/11/26 09:39:30 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DLCOMPAT_BUILDLINK3_MK:= ${DLCOMPAT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndlcompat}
BUILDLINK_PACKAGES+= dlcompat
.if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dlcompat+= dlcompat>=20030629
+BUILDLINK_API_DEPENDS.dlcompat+= dlcompat>=20030629
BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat
.endif # DLCOMPAT_BUILDLINK3_MK
diff --git a/devel/dlcompat/builtin.mk b/devel/dlcompat/builtin.mk
index b158e625103..5e8dceff9f3 100644
--- a/devel/dlcompat/builtin.mk
+++ b/devel/dlcompat/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:48 reed Exp $
BUILTIN_PKG:= dlcompat
@@ -46,7 +46,7 @@ USE_BUILTIN.dlcompat= ${IS_BUILTIN.dlcompat}
. if defined(BUILTIN_PKG.dlcompat) && \
!empty(IS_BUILTIN.dlcompat:M[yY][eE][sS])
USE_BUILTIN.dlcompat= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.dlcompat}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.dlcompat}
. if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS])
USE_BUILTIN.dlcompat!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dlcompat:Q}; then \
diff --git a/devel/dmalloc/buildlink3.mk b/devel/dmalloc/buildlink3.mk
index 3891135fe73..0e2d136d12a 100644
--- a/devel/dmalloc/buildlink3.mk
+++ b/devel/dmalloc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 03:09:58 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DMALLOC_BUILDLINK3_MK:= ${DMALLOC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndmalloc}
BUILDLINK_PACKAGES+= dmalloc
.if !empty(DMALLOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dmalloc+= dmalloc>=4.8.2nb2
+BUILDLINK_API_DEPENDS.dmalloc+= dmalloc>=4.8.2nb2
BUILDLINK_PKGSRCDIR.dmalloc?= ../../devel/dmalloc
BUILDLINK_DEPMETHOD.dmalloc?= build
.endif # DMALLOC_BUILDLINK3_MK
diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk
index 64306175855..948251d11cb 100644
--- a/devel/edcommon/buildlink3.mk
+++ b/devel/edcommon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EDCOMMON_BUILDLINK3_MK:= ${EDCOMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nedcommon}
BUILDLINK_PACKAGES+= edcommon
.if !empty(EDCOMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edcommon+= edcommon>=32
-BUILDLINK_RECOMMENDED.edcommon?= edcommon>=32nb2
+BUILDLINK_API_DEPENDS.edcommon+= edcommon>=32
+BUILDLINK_ABI_DEPENDS.edcommon?= edcommon>=32nb2
BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon
.endif # EDCOMMON_BUILDLINK3_MK
diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk
index 60d63e84764..5769a6d57b2 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neel2}
BUILDLINK_PACKAGES+= eel2
.if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eel2+= eel2>=2.10.0
-BUILDLINK_RECOMMENDED.eel2?= eel2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.eel2+= eel2>=2.10.0
+BUILDLINK_ABI_DEPENDS.eel2?= eel2>=2.12.2nb2
BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2
.endif # EEL2_BUILDLINK3_MK
diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk
index 59ade78b2b9..2b7f708bacf 100644
--- a/devel/eet/buildlink3.mk
+++ b/devel/eet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 11:31:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EET_BUILDLINK3_MK:= ${EET_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Neet}
BUILDLINK_PACKAGES+= eet
.if !empty(EET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eet+= eet>=0.9.9
+BUILDLINK_API_DEPENDS.eet+= eet>=0.9.9
BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet
.endif # EET_BUILDLINK3_MK
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
index adc16c2d067..df04c7743c8 100644
--- a/devel/ffcall/buildlink3.mk
+++ b/devel/ffcall/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:26 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FFCALL_BUILDLINK3_MK:= ${FFCALL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffcall}
BUILDLINK_PACKAGES+= ffcall
.if !empty(FFCALL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffcall+= ffcall>=1.9
-BUILDLINK_RECOMMENDED.ffcall+= ffcall>=1.10nb1
+BUILDLINK_API_DEPENDS.ffcall+= ffcall>=1.9
+BUILDLINK_ABI_DEPENDS.ffcall+= ffcall>=1.10nb1
BUILDLINK_PKGSRCDIR.ffcall?= ../../devel/ffcall
.endif # FFCALL_BUILDLINK3_MK
diff --git a/devel/flex/buildlink3.mk b/devel/flex/buildlink3.mk
index 12eac561bb8..72aec4aece4 100644
--- a/devel/flex/buildlink3.mk
+++ b/devel/flex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 21:00:14 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:48 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflex}
BUILDLINK_PACKAGES+= flex
.if !empty(FLEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flex+= flex>=2.5.4a
+BUILDLINK_API_DEPENDS.flex+= flex>=2.5.4a
BUILDLINK_PKGSRCDIR.flex?= ../../devel/flex
BUILDLINK_DEPMETHOD.flex?= build
.endif # FLEX_BUILDLINK3_MK
diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk
index 33ab7db7d67..2aabd8cf8f8 100644
--- a/devel/florist/buildlink3.mk
+++ b/devel/florist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FLORIST_BUILDLINK3_MK:= ${FLORIST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflorist}
BUILDLINK_PACKAGES+= florist
.if !empty(FLORIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.florist+= florist>=3.15p
-BUILDLINK_RECOMMENDED.florist?= florist>=3.15pnb2
+BUILDLINK_API_DEPENDS.florist+= florist>=3.15p
+BUILDLINK_ABI_DEPENDS.florist?= florist>=3.15pnb2
BUILDLINK_PKGSRCDIR.florist?= ../../devel/florist
.endif # FLORIST_BUILDLINK3_MK
diff --git a/devel/g-wrap/buildlink3.mk b/devel/g-wrap/buildlink3.mk
index 5b1fc7be53d..ffd4f125d90 100644
--- a/devel/g-wrap/buildlink3.mk
+++ b/devel/g-wrap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap}
BUILDLINK_PACKAGES+= g-wrap
.if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+= g-wrap>=1.9.5
-BUILDLINK_RECOMMENDED.g-wrap?= g-wrap>=1.9.6nb1
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.9.5
+BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.9.6nb1
BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap
.endif # G_WRAP_BUILDLINK3_MK
diff --git a/devel/g-wrap1/buildlink3.mk b/devel/g-wrap1/buildlink3.mk
index 3f2acd7bf7a..41ce07e7f6f 100644
--- a/devel/g-wrap1/buildlink3.mk
+++ b/devel/g-wrap1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
G_WRAP_BUILDLINK3_MK:= ${G_WRAP_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ng-wrap}
BUILDLINK_PACKAGES+= g-wrap
.if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+= g-wrap>=1.3.4nb6
-BUILDLINK_DEPENDS.g-wrap+= g-wrap<1.4
-BUILDLINK_RECOMMENDED.g-wrap?= g-wrap>=1.3.4nb7
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap>=1.3.4nb6
+BUILDLINK_API_DEPENDS.g-wrap+= g-wrap<1.4
+BUILDLINK_ABI_DEPENDS.g-wrap?= g-wrap>=1.3.4nb7
BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap1
.endif # G_WRAP_BUILDLINK3_MK
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 814bab0cdef..2cfc055c6db 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAIL_BUILDLINK3_MK:= ${GAIL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngail}
BUILDLINK_PACKAGES+= gail
.if !empty(GAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gail+= gail>=1.8.0
-BUILDLINK_RECOMMENDED.gail+= gail>=1.8.8nb2
+BUILDLINK_API_DEPENDS.gail+= gail>=1.8.0
+BUILDLINK_ABI_DEPENDS.gail+= gail>=1.8.8nb2
BUILDLINK_PKGSRCDIR.gail?= ../../devel/gail
.endif # GAIL_BUILDLINK3_MK
diff --git a/devel/gal/buildlink3.mk b/devel/gal/buildlink3.mk
index aeb594fce90..42b1e1845ce 100644
--- a/devel/gal/buildlink3.mk
+++ b/devel/gal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GAL_BUILDLINK3_MK:= ${GAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngal}
BUILDLINK_PACKAGES+= gal
.if !empty(GAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal+= gal>=0.22nb6
-BUILDLINK_RECOMMENDED.gal?= gal>=0.24nb2
+BUILDLINK_API_DEPENDS.gal+= gal>=0.22nb6
+BUILDLINK_ABI_DEPENDS.gal?= gal>=0.24nb2
BUILDLINK_PKGSRCDIR.gal?= ../../devel/gal
.endif # GAL_BUILDLINK3_MK
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 091ce59f25a..dc814f10f58 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONFMM_BUILDLINK3_MK:= ${GCONFMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngconfmm}
BUILDLINK_PACKAGES+= gconfmm
.if !empty(GCONFMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gconfmm+= gconfmm>=2.10.0
-BUILDLINK_RECOMMENDED.gconfmm?= gconfmm>=2.12.0nb2
+BUILDLINK_API_DEPENDS.gconfmm+= gconfmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gconfmm?= gconfmm>=2.12.0nb2
BUILDLINK_PKGSRCDIR.gconfmm?= ../../devel/gconfmm
.endif # GCONFMM_BUILDLINK3_MK
diff --git a/devel/gdbada/buildlink3.mk b/devel/gdbada/buildlink3.mk
index 3dafc3b91d3..3d135ac1c98 100644
--- a/devel/gdbada/buildlink3.mk
+++ b/devel/gdbada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:48 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDBADA_BUILDLINK3_MK:= ${GDBADA_BUILDLINK3_MK}+
@@ -9,8 +9,8 @@ BUILDLINK_DEPENDS+= gdbada
.if !empty(GDBADA_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= gdbada
-BUILDLINK_DEPENDS.gdbada+= gdbada>=5.3
-BUILDLINK_RECOMMENDED.gdbada+= gdbada>=6.3nb1
+BUILDLINK_API_DEPENDS.gdbada+= gdbada>=5.3
+BUILDLINK_ABI_DEPENDS.gdbada+= gdbada>=6.3nb1
BUILDLINK_PKGSRCDIR.gdbada?= ../../devel/gdbada
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk
index 09f3e92aa2b..f1d21e8ae9c 100644
--- a/devel/gettext-asprintf/buildlink3.mk
+++ b/devel/gettext-asprintf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/04 18:03:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_ASPRINTF_BUILDLINK3_MK:= ${GETTEXT_ASPRINTF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext-asprintf}
BUILDLINK_PACKAGES+= gettext-asprintf
.if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.14.5
+BUILDLINK_API_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.14.5
BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf
.endif # GETTEXT_ASPRINTF_BUILDLINK3_MK
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index d4f037aafd3..ba4c45fbe9e 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/02/05 22:45:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext}
BUILDLINK_PACKAGES+= gettext
.if !empty(GETTEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib
.endif # GETTEXT_BUILDLINK3_MK
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 3e84044b1fb..8503d268d27 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.30 2006/03/30 18:38:19 jlam Exp $
+# $NetBSD: builtin.mk,v 1.31 2006/04/06 06:21:49 reed Exp $
BUILTIN_PKG:= gettext
@@ -49,7 +49,7 @@ USE_BUILTIN.gettext= ${IS_BUILTIN.gettext}
. if defined(BUILTIN_PKG.gettext) && \
!empty(IS_BUILTIN.gettext:M[yY][eE][sS])
USE_BUILTIN.gettext= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
USE_BUILTIN.gettext!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \
@@ -143,7 +143,7 @@ _BLTN_LIBINTL= -lintl
_BLTN_GETTEXT_ICONV_DEPENDS= gettext-lib>=0.11.5nb1
. if !defined(_BLTN_GETTEXT_NEEDS_ICONV)
_BLTN_GETTEXT_NEEDS_ICONV?= no
-. for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
. if !empty(_BLTN_GETTEXT_NEEDS_ICONV:M[nN][oO])
_BLTN_GETTEXT_NEEDS_ICONV!= \
pkg=`${PKG_BEST_EXISTS} ${_dep_:Q}`; \
@@ -165,7 +165,7 @@ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
. sinclude "../../converters/libiconv/${_mkfile_}"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
. endfor
-BUILDLINK_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS}
+BUILDLINK_API_DEPENDS.gettext+= ${_BLTN_GETTEXT_ICONV_DEPENDS}
_BLTN_LIBINTL+= ${BUILDLINK_LDADD.iconv}
. endif
. endif
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index a5c392f598d..7fc95b32fc0 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:49 reed Exp $
DISTNAME= gettext-0.14.5
PKGNAME= gettext-tools-0.14.5
@@ -9,7 +9,7 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html
COMMENT= Tools for providing messages in different languages
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
CONFLICTS= gettext<0.14.5
USE_PKGLOCALEDIR= yes
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 24d4a27e680..83b90664838 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/02/20 14:04:45 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2006/04/06 06:21:49 reed Exp $
DISTNAME= gettext-0.14.5
CATEGORIES= devel
@@ -10,7 +10,7 @@ COMMENT= Tools for providing messages in different languages
DEPENDS+= gettext-m4-0.14.5:../../devel/gettext-m4
DEPENDS+= gettext-tools-0.14.5:../../devel/gettext-tools
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index a7256047a0b..94e47b664e1 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIBLIB_BUILDLINK3_MK:= ${GIBLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngiblib}
BUILDLINK_PACKAGES+= giblib
.if !empty(GIBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.giblib+= giblib>=1.2.3nb3
-BUILDLINK_RECOMMENDED.giblib+= giblib>=1.2.4nb3
+BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.3nb3
+BUILDLINK_ABI_DEPENDS.giblib+= giblib>=1.2.4nb3
BUILDLINK_PKGSRCDIR.giblib?= ../../devel/giblib
.endif # GIBLIB_BUILDLINK3_MK
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 5a475e394a2..b03d0afe291 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:27 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB_BUILDLINK3_MK:= ${GLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib}
BUILDLINK_PACKAGES+= glib
.if !empty(GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib+= glib>=1.2.10nb5
-BUILDLINK_RECOMMENDED.glib+= glib>=1.2.10nb7
+BUILDLINK_API_DEPENDS.glib+= glib>=1.2.10nb5
+BUILDLINK_ABI_DEPENDS.glib+= glib>=1.2.10nb7
BUILDLINK_PKGSRCDIR.glib?= ../../devel/glib
.endif # GLIB_BUILDLINK3_MK
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 6e059e1c30d..d2f40601b58 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIB2_BUILDLINK3_MK:= ${GLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglib2}
BUILDLINK_PACKAGES+= glib2
.if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0
-BUILDLINK_RECOMMENDED.glib2+= glib2>=2.8.6nb1
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0
+BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.8.6nb1
BUILDLINK_PKGSRCDIR.glib2?= ../../devel/glib2
.endif # GLIB2_BUILDLINK3_MK
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 94f2c2553b5..ed2fa8f2671 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/12 21:09:45 adam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:49 reed Exp $
DISTNAME= glibmm-2.8.5
CATEGORIES= devel
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC:Q}/glib/glibmm-2.4.pc.in
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.glib2+= glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libsigc++2/buildlink3.mk"
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 02669b4a4e7..1275df948de 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLIBMM_BUILDLINK3_MK:= ${GLIBMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglibmm}
BUILDLINK_PACKAGES+= glibmm
.if !empty(GLIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibmm+= glibmm>=2.6.1
-BUILDLINK_RECOMMENDED.glibmm?= glibmm>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.6.1
+BUILDLINK_ABI_DEPENDS.glibmm?= glibmm>=2.8.3nb1
BUILDLINK_PKGSRCDIR.glibmm?= ../../devel/glibmm
.endif # GLIBMM_BUILDLINK3_MK
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index f3ba3a02536..2f2c1d1fa00 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:28 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GMP_BUILDLINK3_MK:= ${GMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngmp}
BUILDLINK_PACKAGES+= gmp
.if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmp+= gmp>=4.1.2
-BUILDLINK_RECOMMENDED.gmp+= gmp>=4.1.3nb1
+BUILDLINK_API_DEPENDS.gmp+= gmp>=4.1.2
+BUILDLINK_ABI_DEPENDS.gmp+= gmp>=4.1.3nb1
BUILDLINK_PKGSRCDIR.gmp?= ../../devel/gmp
.endif # GMP_BUILDLINK3_MK
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index 639057655bd..1e6d1411450 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_BASE_BUILDLINK3_MK:= ${GNUSTEP_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-base}
BUILDLINK_PACKAGES+= gnustep-base
.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-base+= gnustep-base>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-base+= gnustep-base>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-base+= gnustep-base>=1.11.2nb1
BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base
PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/System\/Library\/Headers\/Foundation$$/ { print "@comment in devel/gnustep-base: " $$0; next; }
diff --git a/devel/gnustep-make/buildlink3.mk b/devel/gnustep-make/buildlink3.mk
index 7c433448db5..6cb6f59c6aa 100644
--- a/devel/gnustep-make/buildlink3.mk
+++ b/devel/gnustep-make/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_MAKE_BUILDLINK3_MK:= ${GNUSTEP_MAKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-make}
BUILDLINK_PACKAGES+= gnustep-make
.if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-make+= gnustep-make>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-make?= gnustep-make>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-make?= gnustep-make>=1.11.2nb1
BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make
.include "../../devel/gnustep-make/gnustep.mk"
diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk
index 7d2219a908b..bc1259b78ec 100644
--- a/devel/gnustep-objc-lf2/buildlink3.mk
+++ b/devel/gnustep-objc-lf2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_OBJC_LF2_BUILDLINK3_MK:= ${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc-lf2}
BUILDLINK_PACKAGES+= gnustep-objc-lf2
.if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88
-BUILDLINK_RECOMMENDED.gnustep-objc-lf2?= gnustep-objc-lf2>=2.95.3.88nb1
+BUILDLINK_API_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88
+BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?= gnustep-objc-lf2>=2.95.3.88nb1
BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2
BUILDLINK_TRANSFORM.gnustep-objc-lf2?= -e "s|Headers/objc_lf2/|Headers/objc/|g"
BUILDLINK_TRANSFORM+= l:objc:objc_lf2
diff --git a/devel/gnustep-objc/buildlink3.mk b/devel/gnustep-objc/buildlink3.mk
index d7b4b16beba..409e0bab1d3 100644
--- a/devel/gnustep-objc/buildlink3.mk
+++ b/devel/gnustep-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNUSTEP_OBJC_BUILDLINK3_MK:= ${GNUSTEP_OBJC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-objc}
BUILDLINK_PACKAGES+= gnustep-objc
.if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc+= gnustep-objc>=1.3.0
-BUILDLINK_RECOMMENDED.gnustep-objc?= gnustep-objc>=1.3.0nb1
+BUILDLINK_API_DEPENDS.gnustep-objc+= gnustep-objc>=1.3.0
+BUILDLINK_ABI_DEPENDS.gnustep-objc?= gnustep-objc>=1.3.0nb1
BUILDLINK_PKGSRCDIR.gnustep-objc?= ../../devel/gnustep-objc
.endif # GNUSTEP_OBJC_BUILDLINK3_MK
diff --git a/devel/gob2/buildlink3.mk b/devel/gob2/buildlink3.mk
index 8e68455a486..833f5bf6a8a 100644
--- a/devel/gob2/buildlink3.mk
+++ b/devel/gob2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GOB2_BUILDLINK3_MK:= ${GOB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngob2}
BUILDLINK_PACKAGES+= gob2
.if !empty(GOB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gob2+= gob2>=2.0.10
-BUILDLINK_RECOMMENDED.gob2?= gob2>=2.0.12nb1
+BUILDLINK_API_DEPENDS.gob2+= gob2>=2.0.10
+BUILDLINK_ABI_DEPENDS.gob2?= gob2>=2.0.12nb1
BUILDLINK_PKGSRCDIR.gob2?= ../../devel/gob2
.endif # GOB2_BUILDLINK3_MK
diff --git a/devel/gperf/buildlink3.mk b/devel/gperf/buildlink3.mk
index e4fc203276b..5e190931114 100644
--- a/devel/gperf/buildlink3.mk
+++ b/devel/gperf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GPERF_BUILDLINK3_MK:= ${GPERF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngperf}
BUILDLINK_PACKAGES+= gperf
.if !empty(GPERF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gperf+= gperf>=3.0.1
+BUILDLINK_API_DEPENDS.gperf+= gperf>=3.0.1
BUILDLINK_PKGSRCDIR.gperf?= ../../devel/gperf
BUILDLINK_DEPMETHOD.gperf?= build
.endif # GPERF_BUILDLINK3_MK
diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk
index 2d64a5df0dd..616df1fcd22 100644
--- a/devel/gtl/buildlink3.mk
+++ b/devel/gtl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/02 20:36:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTL_BUILDLINK3_MK:= ${GTL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtl}
BUILDLINK_PACKAGES+= gtl
.if !empty(GTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtl+= gtl>=1.2.0
+BUILDLINK_API_DEPENDS.gtl+= gtl>=1.2.0
BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl
.endif # GTL_BUILDLINK3_MK
diff --git a/devel/guile-gtk/buildlink3.mk b/devel/guile-gtk/buildlink3.mk
index d2f98cee579..afbbde9550c 100644
--- a/devel/guile-gtk/buildlink3.mk
+++ b/devel/guile-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk}
BUILDLINK_PACKAGES+= guile-gtk
.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+= guile-gtk>=0.40
-BUILDLINK_RECOMMENDED.guile-gtk?= guile-gtk>=0.40.91nb1
+BUILDLINK_API_DEPENDS.guile-gtk+= guile-gtk>=0.40
+BUILDLINK_ABI_DEPENDS.guile-gtk?= guile-gtk>=0.40.91nb1
BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile-gtk
.endif # GUILE_GTK_BUILDLINK3_MK
diff --git a/devel/guile14-gtk/buildlink3.mk b/devel/guile14-gtk/buildlink3.mk
index 7a65a0f6452..2fa5fe86603 100644
--- a/devel/guile14-gtk/buildlink3.mk
+++ b/devel/guile14-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:49 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILE_GTK_BUILDLINK3_MK:= ${GUILE_GTK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile-gtk}
BUILDLINK_PACKAGES+= guile-gtk
.if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+= guile-gtk>=0.19nb4
-BUILDLINK_RECOMMENDED.guile-gtk+= guile-gtk>=0.19nb7
+BUILDLINK_API_DEPENDS.guile-gtk+= guile-gtk>=0.19nb4
+BUILDLINK_ABI_DEPENDS.guile-gtk+= guile-gtk>=0.19nb7
BUILDLINK_PKGSRCDIR.guile-gtk?= ../../devel/guile14-gtk
.endif # GUILE_GTK_BUILDLINK3_MK
diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk
index 22838c957d5..007748866b8 100644
--- a/devel/hdf/buildlink3.mk
+++ b/devel/hdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HDF_BUILDLINK3_MK:= ${HDF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf}
BUILDLINK_PACKAGES+= hdf
.if !empty(HDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf+= hdf>=4.1r5
-BUILDLINK_RECOMMENDED.hdf?= hdf>=4.2r1nb1
+BUILDLINK_API_DEPENDS.hdf+= hdf>=4.1r5
+BUILDLINK_ABI_DEPENDS.hdf?= hdf>=4.2r1nb1
BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf
.endif # HDF_BUILDLINK3_MK
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 04cf2e1ca09..93b5805ba24 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/10 19:56:13 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HDF5_BUILDLINK3_MK:= ${HDF5_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhdf5}
BUILDLINK_PACKAGES+= hdf5
.if !empty(HDF5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf5+= hdf5>=1.6.2
-BUILDLINK_RECOMMENDED.hdf5+= hdf5>=1.6.5nb1
+BUILDLINK_API_DEPENDS.hdf5+= hdf5>=1.6.2
+BUILDLINK_ABI_DEPENDS.hdf5+= hdf5>=1.6.5nb1
BUILDLINK_PKGSRCDIR.hdf5?= ../../devel/hdf5
.endif # HDF5_BUILDLINK3_MK
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 888105bf968..8000566716d 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDESDK_BUILDLINK3_MK:= ${KDESDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdesdk}
BUILDLINK_PACKAGES+= kdesdk
.if !empty(KDESDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdesdk?= kdesdk>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdesdk+= kdesdk>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdesdk?= kdesdk>=3.5.1nb1
BUILDLINK_PKGSRCDIR.kdesdk?= ../../devel/kdesdk3
.endif # KDESDK_BUILDLINK3_MK
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
index aa68a1f1baa..a68971c223f 100644
--- a/devel/ldapsdk/buildlink3.mk
+++ b/devel/ldapsdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LDAPSDK_BUILDLINK3_MK:= ${LDAPSDK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nldapsdk}
BUILDLINK_PACKAGES+= ldapsdk
.if !empty(LDAPSDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ldapsdk+= ldapsdk>=12311998
-BUILDLINK_RECOMMENDED.ldapsdk?= ldapsdk>=12311998nb2
+BUILDLINK_API_DEPENDS.ldapsdk+= ldapsdk>=12311998
+BUILDLINK_ABI_DEPENDS.ldapsdk?= ldapsdk>=12311998nb2
BUILDLINK_PKGSRCDIR.ldapsdk?= ../../devel/ldapsdk
.endif # LDAPSDK_BUILDLINK3_MK
diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk
index f6e4c21524c..16d12b2f0be 100644
--- a/devel/libFoundation/buildlink3.mk
+++ b/devel/libFoundation/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFOUNDATION_BUILDLINK3_MK:= ${LIBFOUNDATION_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibFoundation}
BUILDLINK_PACKAGES+= libFoundation
.if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libFoundation+= libFoundation>=1.0.72.107nb1
-BUILDLINK_RECOMMENDED.libFoundation?= libFoundation>=1.0.72.107nb2
+BUILDLINK_API_DEPENDS.libFoundation+= libFoundation>=1.0.72.107nb1
+BUILDLINK_ABI_DEPENDS.libFoundation?= libFoundation>=1.0.72.107nb2
BUILDLINK_PKGSRCDIR.libFoundation?= ../../devel/libFoundation
PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/System\/Libraries$$/ { print "@comment in devel/libFoundation: " $$0; next; }
diff --git a/devel/libargparse/buildlink3.mk b/devel/libargparse/buildlink3.mk
index b5339b5eca1..1a034823510 100644
--- a/devel/libargparse/buildlink3.mk
+++ b/devel/libargparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBARGPARSE_BUILDLINK3_MK:= ${LIBARGPARSE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibargparse}
BUILDLINK_PACKAGES+= libargparse
.if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libargparse+= libargparse>=0.1.0000
-BUILDLINK_RECOMMENDED.libargparse+= libargparse>=0.1.0000nb1
+BUILDLINK_API_DEPENDS.libargparse+= libargparse>=0.1.0000
+BUILDLINK_ABI_DEPENDS.libargparse+= libargparse>=0.1.0000nb1
BUILDLINK_PKGSRCDIR.libargparse?= ../../devel/libargparse
.endif # LIBARGPARSE_BUILDLINK3_MK
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index 831723f54f7..7e0e7f579dd 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAST_BUILDLINK3_MK:= ${LIBAST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibast}
BUILDLINK_PACKAGES+= libast
.if !empty(LIBAST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libast+= libast>=0.5nb5
-BUILDLINK_RECOMMENDED.libast+= libast>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libast+= libast>=0.5nb5
+BUILDLINK_ABI_DEPENDS.libast+= libast>=0.6.1nb1
BUILDLINK_PKGSRCDIR.libast?= ../../devel/libast
.endif # LIBAST_BUILDLINK3_MK
diff --git a/devel/libaura/buildlink3.mk b/devel/libaura/buildlink3.mk
index 75b337ec9cd..04312fd7aa4 100644
--- a/devel/libaura/buildlink3.mk
+++ b/devel/libaura/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:40:28 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBAURA_BUILDLINK3_MK:= ${LIBAURA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibaura}
BUILDLINK_PACKAGES+= libaura
.if !empty(LIBAURA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libaura+= libaura>=2.0
+BUILDLINK_API_DEPENDS.libaura+= libaura>=2.0
BUILDLINK_PKGSRCDIR.libaura?= ../../devel/libaura
.endif # LIBAURA_BUILDLINK3_MK
diff --git a/devel/libbegemot/buildlink3.mk b/devel/libbegemot/buildlink3.mk
index 91ad7f04a00..00f37be9c5e 100644
--- a/devel/libbegemot/buildlink3.mk
+++ b/devel/libbegemot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 11:13:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBEGEMOT_BUILDLINK3_MK:= ${LIBBEGEMOT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbegemot}
BUILDLINK_PACKAGES+= libbegemot
.if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbegemot+= libbegemot>=1.9nb1
+BUILDLINK_API_DEPENDS.libbegemot+= libbegemot>=1.9nb1
BUILDLINK_PKGSRCDIR.libbegemot?= ../../devel/libbegemot
.endif # LIBBEGEMOT_BUILDLINK3_MK
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 6e61a345632..264c34ee603 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBO_BUILDLINK3_MK:= ${LIBBONOBO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonobo}
BUILDLINK_PACKAGES+= libbonobo
.if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.8.0
-BUILDLINK_RECOMMENDED.libbonobo+= libbonobo>=2.10.1nb2
+BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonobo+= libbonobo>=2.10.1nb2
BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo
BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/*
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 0da0cdd323c..be4899eb217 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/03/30 21:09:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2006/04/06 06:21:50 reed Exp $
#
DISTNAME= libbonoboui-2.14.0
@@ -22,8 +22,8 @@ PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.14.0
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.14.0
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 6caf44a21a1..79c8315c5c8 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibbonoboui}
BUILDLINK_PACKAGES+= libbonoboui
.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonoboui+= libbonoboui>=2.8.0
-BUILDLINK_RECOMMENDED.libbonoboui+= libbonoboui>=2.10.1nb3
+BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.10.1nb3
BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui
.endif # LIBBONOBOUI_BUILDLINK3_MK
diff --git a/devel/libcfg+/buildlink3.mk b/devel/libcfg+/buildlink3.mk
index 0065a95abd8..67f036f4bf2 100644
--- a/devel/libcfg+/buildlink3.mk
+++ b/devel/libcfg+/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBCFG_BUILDLINK3_MK:= ${LIBCFG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcfg}
BUILDLINK_PACKAGES+= libcfg
.if !empty(LIBCFG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcfg+= libcfg+>=0.6.2nb1
-BUILDLINK_RECOMMENDED.libcfg++= libcfg+>=0.6.2nb3
+BUILDLINK_API_DEPENDS.libcfg+= libcfg+>=0.6.2nb1
+BUILDLINK_ABI_DEPENDS.libcfg++= libcfg+>=0.6.2nb3
BUILDLINK_PKGSRCDIR.libcfg?= ../../devel/libcfg+
.endif # LIBCFG_BUILDLINK3_MK
diff --git a/devel/libdfui/buildlink3.mk b/devel/libdfui/buildlink3.mk
index 29dcdb3e347..84d42f55a97 100644
--- a/devel/libdfui/buildlink3.mk
+++ b/devel/libdfui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:41:36 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDFUI_BUILDLINK3_MK:= ${LIBDFUI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdfui}
BUILDLINK_PACKAGES+= libdfui
.if !empty(LIBDFUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdfui+= libdfui>=3.0
+BUILDLINK_API_DEPENDS.libdfui+= libdfui>=3.0
BUILDLINK_PKGSRCDIR.libdfui?= ../../devel/libdfui
.endif # LIBDFUI_BUILDLINK3_MK
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index ec4546b89b4..59678101e1b 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/26 17:05:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/06 06:21:50 reed Exp $
#
DISTNAME= libdnsres-0.1a
@@ -15,7 +15,7 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
# uses event_once
-BUILDLINK_DEPENDS.libevent+= libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+= libevent>=0.9
.include "../../devel/libevent/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk
index f728c3a31e7..364687abe69 100644
--- a/devel/libdnsres/buildlink3.mk
+++ b/devel/libdnsres/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/19 17:11:06 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDNSRES_BUILDLINK3_MK:= ${LIBDNSRES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdnsres}
BUILDLINK_PACKAGES+= libdnsres
.if !empty(LIBDNSRES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnsres+= libdnsres>=0.1a
+BUILDLINK_API_DEPENDS.libdnsres+= libdnsres>=0.1a
BUILDLINK_PKGSRCDIR.libdnsres?= ../../devel/libdnsres
.endif # LIBDNSRES_BUILDLINK3_MK
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index f947a7d31c0..840ad486eb9 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBDOCKAPP_BUILDLINK3_MK:= ${LIBDOCKAPP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibdockapp}
BUILDLINK_PACKAGES+= libdockapp
.if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdockapp+= libdockapp>=0.4.0
-BUILDLINK_RECOMMENDED.libdockapp+= libdockapp>=0.4.0nb2
+BUILDLINK_API_DEPENDS.libdockapp+= libdockapp>=0.4.0
+BUILDLINK_ABI_DEPENDS.libdockapp+= libdockapp>=0.4.0nb2
BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp
.endif # LIBDOCKAPP_BUILDLINK3_MK
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 53bc9fdec64..543553774c7 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:50 reed Exp $
#
# This Makefile fragment is included by packages that use libebml.
#
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibebml}
BUILDLINK_PACKAGES+= libebml
.if !empty(LIBEBML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libebml+= libebml>=0.7.6
-BUILDLINK_RECOMMENDED.libebml?= libebml>=0.7.6nb1
+BUILDLINK_API_DEPENDS.libebml+= libebml>=0.7.6
+BUILDLINK_ABI_DEPENDS.libebml?= libebml>=0.7.6nb1
BUILDLINK_PKGSRCDIR.libebml?= ../../devel/libebml
.endif # LIBEBML_BUILDLINK3_MK
diff --git a/devel/libelf/buildlink3.mk b/devel/libelf/buildlink3.mk
index 7dd845e4de8..c980a7448dc 100644
--- a/devel/libelf/buildlink3.mk
+++ b/devel/libelf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/08/13 07:09:01 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBELF_BUILDLINK3_MK:= ${LIBELF_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibelf}
BUILDLINK_PACKAGES+= libelf
.if !empty(LIBELF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libelf+= libelf>=0.8.5
+BUILDLINK_API_DEPENDS.libelf+= libelf>=0.8.5
BUILDLINK_PKGSRCDIR.libelf?= ../../devel/libelf
BUILDLINK_DEPMETHOD.libelf?= build
.endif # LIBELF_BUILDLINK3_MK
diff --git a/devel/libetm/buildlink3.mk b/devel/libetm/buildlink3.mk
index dbe71c2ff21..b4713990b69 100644
--- a/devel/libetm/buildlink3.mk
+++ b/devel/libetm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/05 11:10:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBETM_BUILDLINK3_MK:= ${LIBETM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibetm}
BUILDLINK_PACKAGES+= libetm
.if !empty(LIBETM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetm+= libetm>=1.09
+BUILDLINK_API_DEPENDS.libetm+= libetm>=1.09
BUILDLINK_PKGSRCDIR.libetm?= ../../devel/libetm
BUILDLINK_DEPMETHOD.libetm?= build
.endif # LIBETM_BUILDLINK3_MK
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index b029edc9d9e..88e6d3e0560 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/09/16 14:46:43 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:50 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEVENT_BUILDLINK3_MK:= ${LIBEVENT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibevent}
BUILDLINK_PACKAGES+= libevent
.if !empty(LIBEVENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libevent+= libevent>=0.6
+BUILDLINK_API_DEPENDS.libevent+= libevent>=0.6
BUILDLINK_PKGSRCDIR.libevent?= ../../devel/libevent
.endif # LIBEVENT_BUILDLINK3_MK
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index 974625a06fc..394ba1ee65c 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:21:50 reed Exp $
BUILTIN_PKG:= libevent
@@ -31,7 +31,7 @@ USE_BUILTIN.libevent= ${IS_BUILTIN.libevent}
. if defined(BUILTIN_PKG.libevent) && \
!empty(IS_BUILTIN.libevent:M[yY][eE][sS])
USE_BUILTIN.libevent= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.libevent}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.libevent}
. if !empty(USE_BUILTIN.libevent:M[yY][eE][sS])
USE_BUILTIN.libevent!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index 09ebc6154b4..b9780185db1 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/05 22:06:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXTRACTOR_BUILDLINK3_MK:= ${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibextractor}
BUILDLINK_PACKAGES+= libextractor
.if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libextractor+= libextractor>=0.3.10
-BUILDLINK_RECOMMENDED.libextractor+= libextractor>=0.5.3nb3
+BUILDLINK_API_DEPENDS.libextractor+= libextractor>=0.3.10
+BUILDLINK_ABI_DEPENDS.libextractor+= libextractor>=0.5.3nb3
BUILDLINK_PKGSRCDIR.libextractor?= ../../devel/libextractor
.endif # LIBEXTRACTOR_BUILDLINK3_MK
diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk
index 876d947f8c1..9f4cc91a47d 100644
--- a/devel/libffi/buildlink3.mk
+++ b/devel/libffi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi}
BUILDLINK_PACKAGES+= libffi
.if !empty(LIBFFI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libffi+= libffi>=1.20
-BUILDLINK_RECOMMENDED.libffi+= libffi>=2.0betanb1
+BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20
+BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1
BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi
.endif # LIBFFI_BUILDLINK3_MK
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index 474a5b6bc04..984a653bf8d 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGAIL_GNOME_BUILDLINK3_MK:= ${LIBGAIL_GNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgail-gnome}
BUILDLINK_PACKAGES+= libgail-gnome
.if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2
-BUILDLINK_RECOMMENDED.libgail-gnome?= libgail-gnome>=1.1.3
+BUILDLINK_API_DEPENDS.libgail-gnome+= libgail-gnome>=1.1.1nb2
+BUILDLINK_ABI_DEPENDS.libgail-gnome?= libgail-gnome>=1.1.3
BUILDLINK_PKGSRCDIR.libgail-gnome?= ../../devel/libgail-gnome
.endif # LIBGAIL_GNOME_BUILDLINK3_MK
diff --git a/devel/libgetopt/buildlink3.mk b/devel/libgetopt/buildlink3.mk
index 09b9b67275d..cc2ad10fda1 100644
--- a/devel/libgetopt/buildlink3.mk
+++ b/devel/libgetopt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGETOPT_BUILDLINK3_MK:= ${LIBGETOPT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngetopt}
BUILDLINK_PACKAGES+= getopt
.if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.getopt+= libgetopt>=1.3
+BUILDLINK_API_DEPENDS.getopt+= libgetopt>=1.3
BUILDLINK_PKGSRCDIR.getopt?= ../../devel/libgetopt
.endif # LIBGETOPT_BUILDLINK3_MK
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index 6a7e28684d7..daa285eb9ba 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILTIN_PKG:= getopt
@@ -32,7 +32,7 @@ USE_BUILTIN.getopt= ${IS_BUILTIN.getopt}
. if defined(BUILTIN_PKG.getopt) && \
!empty(IS_BUILTIN.getopt:M[yY][eE][sS])
USE_BUILTIN.getopt= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.getopt}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.getopt}
. if !empty(USE_BUILTIN.getopt:M[yY][eE][sS])
USE_BUILTIN.getopt!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.getopt:Q}; then \
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 2080e21b736..b424e80c648 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE_BUILDLINK3_MK:= ${LIBGLADE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade}
BUILDLINK_PACKAGES+= libglade
.if !empty(LIBGLADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade+= libglade>=0.17nb5
-BUILDLINK_RECOMMENDED.libglade+= libglade>=0.17nb8
+BUILDLINK_API_DEPENDS.libglade+= libglade>=0.17nb5
+BUILDLINK_ABI_DEPENDS.libglade+= libglade>=0.17nb8
BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade
.endif # LIBGLADE_BUILDLINK3_MK
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 5342063061e..2da21c66aac 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/21 06:00:44 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libglade-2.5.1
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+= --without-xml-catalog
XML_ENTRIES= system http://glade.gnome.org/glade-2.0.dtd \
${PREFIX}/share/xml/libglade/glade-2.0.dtd
-BUILDLINK_DEPENDS.atk+= atk>=1.9.0
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.atk+= atk>=1.9.0
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/libglade/2.0
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index fbf72a77ceb..6e122ba578a 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADE2_BUILDLINK3_MK:= ${LIBGLADE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglade2}
BUILDLINK_PACKAGES+= libglade2
.if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.3.6
-BUILDLINK_RECOMMENDED.libglade2+= libglade2>=2.5.1nb2
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.3.6
+BUILDLINK_ABI_DEPENDS.libglade2+= libglade2>=2.5.1nb2
BUILDLINK_PKGSRCDIR.libglade2?= ../../devel/libglade2
PRINT_PLIST_AWK+= /^@dirrm lib\/libglade$$/ { next; }
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index fad553d8de7..abd63fe0ec8 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGLADEMM_BUILDLINK3_MK:= ${LIBGLADEMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibglademm}
BUILDLINK_PACKAGES+= libglademm
.if !empty(LIBGLADEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglademm+= libglademm>=2.6.0
-BUILDLINK_RECOMMENDED.libglademm?= libglademm>=2.6.1nb2
+BUILDLINK_API_DEPENDS.libglademm+= libglademm>=2.6.0
+BUILDLINK_ABI_DEPENDS.libglademm?= libglademm>=2.6.1nb2
BUILDLINK_PKGSRCDIR.libglademm?= ../../devel/libglademm
.endif # LIBGLADEMM_BUILDLINK3_MK
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 4d09bec84ca..1ff5a0ffc62 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libgnome-2.14.0
@@ -13,7 +13,7 @@ COMMENT= Core GNOME2 library (non-graphical)
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.esound+= esound>=0.2.26
+BUILDLINK_API_DEPENDS.esound+= esound>=0.2.26
GNU_CONFIGURE= YES
USE_TOOLS+= gmake pkg-config
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index a0d2697bff7..ffe253c4bab 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnome}
BUILDLINK_PACKAGES+= libgnome
.if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnome+= libgnome>=2.8.0
-BUILDLINK_RECOMMENDED.libgnome+= libgnome>=2.12.0.1nb3
+BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.12.0.1nb3
BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome
.endif # LIBGNOME_BUILDLINK3_MK
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index ca9bb22fb55..c88167c4860 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEMM_BUILDLINK3_MK:= ${LIBGNOMEMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomemm}
BUILDLINK_PACKAGES+= libgnomemm
.if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomemm+= libgnomemm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomemm?= libgnomemm>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomemm+= libgnomemm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomemm?= libgnomemm>=2.12.1nb2
BUILDLINK_PKGSRCDIR.libgnomemm?= ../../devel/libgnomemm
.endif # LIBGNOMEMM_BUILDLINK3_MK
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 10cc71b833e..1eb62464cba 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/31 10:57:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/06 06:21:51 reed Exp $
#
DISTNAME= libgnomeui-2.14.0
@@ -27,9 +27,9 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
PKGCONFIG_BASE= ${WRKSRC}/libgnomeui/libgnomeui-2.0.pc
PKGCONFIG_OVERRIDE= ${PKGCONFIG_BASE}.in
-BUILDLINK_DEPENDS.gtk2= gtk2+>=2.8.0
-BUILDLINK_DEPENDS.libbonoboui= libgnome>=2.13.1
-BUILDLINK_DEPENDS.libgnome= libgnome>=2.13.7
+BUILDLINK_API_DEPENDS.gtk2= gtk2+>=2.8.0
+BUILDLINK_API_DEPENDS.libbonoboui= libgnome>=2.13.1
+BUILDLINK_API_DEPENDS.libgnome= libgnome>=2.13.7
# Needed because part of the pc files doesn't get filled in till after
# configure does its pass
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index d3957ff48e5..c493c387f28 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/03/06 00:18:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUI_BUILDLINK3_MK:= ${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeui}
BUILDLINK_PACKAGES+= libgnomeui
.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeui+= libgnomeui>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.12.1
BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui
.endif # LIBGNOMEUI_BUILDLINK3_MK
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index 3720ffc5014..ae9a4927083 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMEUIMM_BUILDLINK3_MK:= ${LIBGNOMEUIMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomeuimm}
BUILDLINK_PACKAGES+= libgnomeuimm
.if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomeuimm?= libgnomeuimm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.libgnomeuimm+= libgnomeuimm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomeuimm?= libgnomeuimm>=2.12.0nb3
BUILDLINK_PKGSRCDIR.libgnomeuimm?= ../../devel/libgnomeuimm
.endif # LIBGNOMEUIMM_BUILDLINK3_MK
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
index 35e7fbd0aa0..40e4cfb0823 100644
--- a/devel/libgphoto2/buildlink3.mk
+++ b/devel/libgphoto2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGPHOTO2_BUILDLINK3_MK:= ${LIBGPHOTO2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgphoto2}
BUILDLINK_PACKAGES+= libgphoto2
.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgphoto2+= libgphoto2>=2.1.2
-BUILDLINK_RECOMMENDED.libgphoto2+= libgphoto2>=2.1.6nb1
+BUILDLINK_API_DEPENDS.libgphoto2+= libgphoto2>=2.1.2
+BUILDLINK_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.1.6nb1
BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2
.endif # LIBGPHOTO2_BUILDLINK3_MK
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
index 8f0198e13fb..9afbd6ad9a0 100644
--- a/devel/libgsf/buildlink3.mk
+++ b/devel/libgsf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgsf}
BUILDLINK_PACKAGES+= libgsf
.if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgsf+= libgsf>=1.13.3
-BUILDLINK_RECOMMENDED.libgsf?= libgsf>=1.14.0
+BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.13.3
+BUILDLINK_ABI_DEPENDS.libgsf?= libgsf>=1.14.0
BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf
.endif # LIBGSF_BUILDLINK3_MK
diff --git a/devel/libhfs/buildlink3.mk b/devel/libhfs/buildlink3.mk
index 2f90a1ce651..d54a3daf771 100644
--- a/devel/libhfs/buildlink3.mk
+++ b/devel/libhfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/01/03 01:56:15 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBHFS_BUILDLINK3_MK:= ${LIBHFS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibhfs}
BUILDLINK_PACKAGES+= libhfs
.if !empty(LIBHFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhfs+= libhfs>=3.2.6nb1
+BUILDLINK_API_DEPENDS.libhfs+= libhfs>=3.2.6nb1
BUILDLINK_PKGSRCDIR.libhfs?= ../../devel/libhfs
.endif # LIBHFS_BUILDLINK3_MK
diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk
index 7c1313d83f1..e9badbd7f28 100644
--- a/devel/libiberty/buildlink3.mk
+++ b/devel/libiberty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIBERTY_BUILDLINK3_MK:= ${LIBIBERTY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibiberty}
BUILDLINK_PACKAGES+= libiberty
.if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libiberty+= libiberty>=1.0nb1
-BUILDLINK_RECOMMENDED.libiberty?= libiberty>=1.0nb2
+BUILDLINK_API_DEPENDS.libiberty+= libiberty>=1.0nb1
+BUILDLINK_ABI_DEPENDS.libiberty?= libiberty>=1.0nb2
BUILDLINK_PKGSRCDIR.libiberty?= ../../devel/libiberty
.endif # LIBIBERTY_BUILDLINK3_MK
BUILDLINK_DEPMETHOD.libiberty?= build
diff --git a/devel/libidn/buildlink3.mk b/devel/libidn/buildlink3.mk
index 6ee2071a4e1..1688dbbe37f 100644
--- a/devel/libidn/buildlink3.mk
+++ b/devel/libidn/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBIDN_BUILDLINK3_MK:= ${LIBIDN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibidn}
BUILDLINK_PACKAGES+= libidn
.if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidn+= libidn>=0.4.6
-BUILDLINK_RECOMMENDED.libidn+= libidn>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libidn+= libidn>=0.4.6
+BUILDLINK_ABI_DEPENDS.libidn+= libidn>=0.6.1nb1
BUILDLINK_PKGSRCDIR.libidn?= ../../devel/libidn
.endif # LIBIDN_BUILDLINK3_MK
diff --git a/devel/libinstaller/buildlink3.mk b/devel/libinstaller/buildlink3.mk
index 5c50b2bbc41..60e29b7e791 100644
--- a/devel/libinstaller/buildlink3.mk
+++ b/devel/libinstaller/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/09 05:44:18 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBINSTALLER_BUILDLINK3_MK:= ${LIBINSTALLER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibinstaller}
BUILDLINK_PACKAGES+= libinstaller
.if !empty(LIBINSTALLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libinstaller+= libinstaller>=4.0
+BUILDLINK_API_DEPENDS.libinstaller+= libinstaller>=4.0
BUILDLINK_PKGSRCDIR.libinstaller?= ../../devel/libinstaller
.endif # LIBINSTALLER_BUILDLINK3_MK
diff --git a/devel/libjit/buildlink3.mk b/devel/libjit/buildlink3.mk
index ade877551d8..e7c2cfb9a48 100644
--- a/devel/libjit/buildlink3.mk
+++ b/devel/libjit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:51 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBJIT_BUILDLINK3_MK:= ${LIBJIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibjit}
BUILDLINK_PACKAGES+= libjit
.if !empty(LIBJIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libjit+= libjit>=0.0.2
-BUILDLINK_RECOMMENDED.libjit+= libjit>=0.0.4nb1
+BUILDLINK_API_DEPENDS.libjit+= libjit>=0.0.2
+BUILDLINK_ABI_DEPENDS.libjit+= libjit>=0.0.4nb1
BUILDLINK_PKGSRCDIR.libjit?= ../../devel/libjit
.endif # LIBJIT_BUILDLINK3_MK
diff --git a/devel/libltdl/buildlink3.mk b/devel/libltdl/buildlink3.mk
index 461dc677b49..866788bbe95 100644
--- a/devel/libltdl/buildlink3.mk
+++ b/devel/libltdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBLTDL_BUILDLINK3_MK:= ${LIBLTDL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibltdl}
BUILDLINK_PACKAGES+= libltdl
.if !empty(LIBLTDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libltdl+= libltdl>=1.5.10
+BUILDLINK_API_DEPENDS.libltdl+= libltdl>=1.5.10
BUILDLINK_PKGSRCDIR.libltdl?= ../../devel/libltdl
.endif # LIBLTDL_BUILDLINK3_MK
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index d28040785df..620a07a0a2d 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMATCHBOX_BUILDLINK3_MK:= ${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmatchbox}
BUILDLINK_PACKAGES+= libmatchbox
.if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatchbox+= libmatchbox>=1.4
-BUILDLINK_RECOMMENDED.libmatchbox+= libmatchbox>=1.7nb2
+BUILDLINK_API_DEPENDS.libmatchbox+= libmatchbox>=1.4
+BUILDLINK_ABI_DEPENDS.libmatchbox+= libmatchbox>=1.7nb2
BUILDLINK_PKGSRCDIR.libmatchbox?= ../../devel/libmatchbox
.endif # LIBMATCHBOX_BUILDLINK3_MK
diff --git a/devel/libmemcache/buildlink3.mk b/devel/libmemcache/buildlink3.mk
index 14cca604376..8d684df0f9d 100644
--- a/devel/libmemcache/buildlink3.mk
+++ b/devel/libmemcache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/11 15:31:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMEMCACHE_BUILDLINK3_MK:= ${LIBMEMCACHE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemcache}
BUILDLINK_PACKAGES+= libmemcache
.if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemcache+= libmemcache>=1.4.0beta5
+BUILDLINK_API_DEPENDS.libmemcache+= libmemcache>=1.4.0beta5
BUILDLINK_PKGSRCDIR.libmemcache?= ../../devel/libmemcache
.endif # LIBMEMCACHE_BUILDLINK3_MK
diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk
index d6e38548c64..cb274e9544c 100644
--- a/devel/libmemmgr/buildlink3.mk
+++ b/devel/libmemmgr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/09 18:37:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMEMMGR_BUILDLINK3_MK:= ${LIBMEMMGR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmemmgr}
BUILDLINK_PACKAGES+= libmemmgr
.if !empty(LIBMEMMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemmgr+= libmemmgr>=1.04
+BUILDLINK_API_DEPENDS.libmemmgr+= libmemmgr>=1.04
BUILDLINK_PKGSRCDIR.libmemmgr?= ../../devel/libmemmgr
BUILDLINK_DEPMETHOD.libmemmgr?= build
.endif # LIBMEMMGR_BUILDLINK3_MK
diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk
index a0ac2c6b1bb..a039dcbfcbb 100644
--- a/devel/libmimedir/buildlink3.mk
+++ b/devel/libmimedir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/13 20:41:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMIMEDIR_BUILDLINK3_MK:= ${LIBMIMEDIR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmimedir}
BUILDLINK_PACKAGES+= libmimedir
.if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmimedir+= libmimedir>=0.4nb1
+BUILDLINK_API_DEPENDS.libmimedir+= libmimedir>=0.4nb1
BUILDLINK_PKGSRCDIR.libmimedir?= ../../devel/libmimedir
.endif # LIBMIMEDIR_BUILDLINK3_MK
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 1bce5d5b813..e343ca526ba 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBMM_BUILDLINK3_MK:= ${LIBMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibmm}
BUILDLINK_PACKAGES+= libmm
.if !empty(LIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmm+= libmm>=1.2.1
-BUILDLINK_RECOMMENDED.libmm+= libmm>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libmm+= libmm>=1.2.1
+BUILDLINK_ABI_DEPENDS.libmm+= libmm>=1.2.2nb1
BUILDLINK_PKGSRCDIR.libmm?= ../../devel/libmm
.endif # LIBMM_BUILDLINK3_MK
diff --git a/devel/libnet/buildlink3.mk b/devel/libnet/buildlink3.mk
index b900dca7de4..0cef0192989 100644
--- a/devel/libnet/buildlink3.mk
+++ b/devel/libnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNET_BUILDLINK3_MK:= ${LIBNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet}
BUILDLINK_PACKAGES+= libnet
.if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+= libnet>=1.0.1bnb3
-BUILDLINK_RECOMMENDED.libnet+= libnet>=1.0.1bnb4
+BUILDLINK_API_DEPENDS.libnet+= libnet>=1.0.1bnb3
+BUILDLINK_ABI_DEPENDS.libnet+= libnet>=1.0.1bnb4
BUILDLINK_PKGSRCDIR.libnet?= ../../devel/libnet
.endif # LIBNET_BUILDLINK3_MK
diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk
index ee78ef262f0..d01ee045f45 100644
--- a/devel/libnet11/buildlink3.mk
+++ b/devel/libnet11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/01/20 18:04:58 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNET_BUILDLINK3_MK:= ${LIBNET_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibnet}
BUILDLINK_PACKAGES+= libnet
.if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+= libnet>=1.1.2.1
+BUILDLINK_API_DEPENDS.libnet+= libnet>=1.1.2.1
BUILDLINK_PKGSRCDIR.libnet?= ../../devel/libnet11
.endif # LIBNET_BUILDLINK3_MK
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
index 81b0662b4ec..71b48bf6740 100644
--- a/devel/libntlm/buildlink3.mk
+++ b/devel/libntlm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBNTLM_BUILDLINK3_MK:= ${LIBNTLM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibntlm}
BUILDLINK_PACKAGES+= libntlm
.if !empty(LIBNTLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libntlm+= libntlm>=0.3.2
-BUILDLINK_RECOMMENDED.libntlm+= libntlm>=0.3.6nb1
+BUILDLINK_API_DEPENDS.libntlm+= libntlm>=0.3.2
+BUILDLINK_ABI_DEPENDS.libntlm+= libntlm>=0.3.6nb1
BUILDLINK_PKGSRCDIR.libntlm?= ../../devel/libntlm
.endif # LIBNTLM_BUILDLINK3_MK
diff --git a/devel/liboil/buildlink3.mk b/devel/liboil/buildlink3.mk
index dd2d2dd1521..3d55c3d00cb 100644
--- a/devel/liboil/buildlink3.mk
+++ b/devel/liboil/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/01/16 18:21:19 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOIL_BUILDLINK3_MK:= ${LIBOIL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboil}
BUILDLINK_PACKAGES+= liboil
.if !empty(LIBOIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboil+= liboil>=0.3.6
+BUILDLINK_API_DEPENDS.liboil+= liboil>=0.3.6
BUILDLINK_PKGSRCDIR.liboil?= ../../devel/liboil
.endif # LIBOIL_BUILDLINK3_MK
diff --git a/devel/libole2/buildlink3.mk b/devel/libole2/buildlink3.mk
index d471a3db3b3..df19be935de 100644
--- a/devel/libole2/buildlink3.mk
+++ b/devel/libole2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOLE2_BUILDLINK3_MK:= ${LIBOLE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibole2}
BUILDLINK_PACKAGES+= libole2
.if !empty(LIBOLE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libole2+= libole2>=0.2.4nb1
-BUILDLINK_RECOMMENDED.libole2+= libole2>=0.2.4nb2
+BUILDLINK_API_DEPENDS.libole2+= libole2>=0.2.4nb1
+BUILDLINK_ABI_DEPENDS.libole2+= libole2>=0.2.4nb2
BUILDLINK_PKGSRCDIR.libole2?= ../../devel/libole2
.endif # LIBOLE2_BUILDLINK3_MK
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
index 5d00bfa30d7..5892f822997 100644
--- a/devel/liboop/buildlink3.mk
+++ b/devel/liboop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOOP_BUILDLINK3_MK:= ${LIBOOP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nliboop}
BUILDLINK_PACKAGES+= liboop
.if !empty(LIBOOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboop+= liboop>=0.9
-BUILDLINK_RECOMMENDED.liboop+= liboop>=1.0nb1
+BUILDLINK_API_DEPENDS.liboop+= liboop>=0.9
+BUILDLINK_ABI_DEPENDS.liboop+= liboop>=1.0nb1
BUILDLINK_PKGSRCDIR.liboop?= ../../devel/liboop
.endif # LIBOOP_BUILDLINK3_MK
diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk
index 0062d5272e5..fff3befc7ca 100644
--- a/devel/libosip/buildlink3.mk
+++ b/devel/libosip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/04/01 19:50:42 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:52 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBOSIP2_BUILDLINK3_MK:= ${LIBOSIP2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibosip2}
BUILDLINK_PACKAGES+= libosip2
.if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libosip2+= libosip2>=2.2.0
-BUILDLINK_RECOMMENDED.libosip2+= libosip2>=2.2.0
+BUILDLINK_API_DEPENDS.libosip2+= libosip2>=2.2.0
+BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=2.2.0
BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip
.endif # LIBOSIP2_BUILDLINK3_MK
diff --git a/devel/libportlib/buildlink3.mk b/devel/libportlib/buildlink3.mk
index 9bc3572e49b..47de17794a0 100644
--- a/devel/libportlib/buildlink3.mk
+++ b/devel/libportlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/04/09 18:38:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPORTLIB_BUILDLINK3_MK:= ${LIBPORTLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibportlib}
BUILDLINK_PACKAGES+= libportlib
.if !empty(LIBPORTLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libportlib+= libportlib>=1.01
+BUILDLINK_API_DEPENDS.libportlib+= libportlib>=1.01
BUILDLINK_PKGSRCDIR.libportlib?= ../../devel/libportlib
BUILDLINK_DEPMETHOD.libportlib?= build
.endif # LIBPORTLIB_BUILDLINK3_MK
diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk
index 522800052ea..cb9f7fffeaa 100644
--- a/devel/libproplist/buildlink3.mk
+++ b/devel/libproplist/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:30 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPROPLIST_BUILDLINK3_MK:= ${LIBPROPLIST_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibproplist}
BUILDLINK_PACKAGES+= libproplist
.if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libproplist+= libproplist>=0.10.1
-BUILDLINK_RECOMMENDED.libproplist+= libproplist>=0.10.1nb1
+BUILDLINK_API_DEPENDS.libproplist+= libproplist>=0.10.1
+BUILDLINK_ABI_DEPENDS.libproplist+= libproplist>=0.10.1nb1
BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist
.endif # LIBPROPLIST_BUILDLINK3_MK
diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk
index 4a28ee9944b..755a431ca8a 100644
--- a/devel/librfuncs/buildlink3.mk
+++ b/devel/librfuncs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/26 18:47:06 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRFUNCS_BUILDLINK3_MK:= ${LIBRFUNCS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrfuncs}
BUILDLINK_PACKAGES+= librfuncs
.if !empty(LIBRFUNCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librfuncs+= librfuncs>=1.0.4
+BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.4
BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs
.endif # LIBRFUNCS_BUILDLINK3_MK
diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk
index f7d083b3977..4af1b4630a6 100644
--- a/devel/librsync/buildlink3.mk
+++ b/devel/librsync/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSYNC_BUILDLINK3_MK:= ${LIBRSYNC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsync}
BUILDLINK_PACKAGES+= librsync
.if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6nb2
-BUILDLINK_RECOMMENDED.librsync+= librsync>=0.9.7nb1
+BUILDLINK_API_DEPENDS.librsync+= librsync>=0.9.6nb2
+BUILDLINK_ABI_DEPENDS.librsync+= librsync>=0.9.7nb1
BUILDLINK_PKGSRCDIR.librsync?= ../../devel/librsync
.endif # LIBRSYNC_BUILDLINK3_MK
diff --git a/devel/libscsi/buildlink3.mk b/devel/libscsi/buildlink3.mk
index 925490dfe5e..e6c44a2c810 100644
--- a/devel/libscsi/buildlink3.mk
+++ b/devel/libscsi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/31 17:13:26 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSCSI_BUILDLINK3_MK:= ${LIBSCSI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibscsi}
BUILDLINK_PACKAGES+= libscsi
.if !empty(LIBSCSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libscsi+= libscsi>=1.6
+BUILDLINK_API_DEPENDS.libscsi+= libscsi>=1.6
BUILDLINK_PKGSRCDIR.libscsi?= ../../devel/libscsi
BUILDLINK_DEPMETHOD.libscsi?= build
.endif # LIBSCSI_BUILDLINK3_MK
diff --git a/devel/libsigc++/buildlink3.mk b/devel/libsigc++/buildlink3.mk
index 2ee27d042ca..37dd254971d 100644
--- a/devel/libsigc++/buildlink3.mk
+++ b/devel/libsigc++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcxx}
BUILDLINK_PACKAGES+= libsigcxx
.if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+= libsigc++>=1.2.3nb1
-BUILDLINK_RECOMMENDED.libsigcxx+= libsigc++>=1.2.7nb1
+BUILDLINK_API_DEPENDS.libsigcxx+= libsigc++>=1.2.3nb1
+BUILDLINK_ABI_DEPENDS.libsigcxx+= libsigc++>=1.2.7nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++
.endif # LIBSIGC++_BUILDLINK3_MK
diff --git a/devel/libsigc++2/buildlink3.mk b/devel/libsigc++2/buildlink3.mk
index 994aeecb167..8a6c21e9480 100644
--- a/devel/libsigc++2/buildlink3.mk
+++ b/devel/libsigc++2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGC++_BUILDLINK3_MK:= ${LIBSIGC++_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcxx}
BUILDLINK_PACKAGES+= libsigcxx
.if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+= libsigc++2>=2.0.3
-BUILDLINK_RECOMMENDED.libsigcxx+= libsigc++2>=2.0.17nb1
+BUILDLINK_API_DEPENDS.libsigcxx+= libsigc++2>=2.0.3
+BUILDLINK_ABI_DEPENDS.libsigcxx+= libsigc++2>=2.0.17nb1
BUILDLINK_PKGSRCDIR.libsigcxx?= ../../devel/libsigc++2
.endif # LIBSIGC++_BUILDLINK3_MK
diff --git a/devel/libsigsegv/buildlink3.mk b/devel/libsigsegv/buildlink3.mk
index 8f4a4064fc5..280dcb8f2c2 100644
--- a/devel/libsigsegv/buildlink3.mk
+++ b/devel/libsigsegv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/11 22:03:52 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSIGSEGV_BUILDLINK3_MK:= ${LIBSIGSEGV_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigsegv}
BUILDLINK_PACKAGES+= libsigsegv
.if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigsegv+= libsigsegv>=2.2
+BUILDLINK_API_DEPENDS.libsigsegv+= libsigsegv>=2.2
BUILDLINK_PKGSRCDIR.libsigsegv?= ../../devel/libsigsegv
# only installs a static library
BUILDLINK_DEPMETHOD.libsigsegv?= build
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 7653b0c811f..1adda9d8dcb 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSLANG_BUILDLINK3_MK:= ${LIBSLANG_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibslang}
BUILDLINK_PACKAGES+= libslang
.if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libslang+= libslang>=1.4.9nb1
-BUILDLINK_RECOMMENDED.libslang+= libslang>=1.4.9nb4
+BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1
+BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4
BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang
.endif # LIBSLANG_BUILDLINK3_MK
diff --git a/devel/libstatgrab/buildlink3.mk b/devel/libstatgrab/buildlink3.mk
index bcc57b9bbf8..b8427f068d2 100644
--- a/devel/libstatgrab/buildlink3.mk
+++ b/devel/libstatgrab/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/30 00:30:29 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSTATGRAB_BUILDLINK3_MK:= ${LIBSTATGRAB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstatgrab}
BUILDLINK_PACKAGES+= libstatgrab
.if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstatgrab+= libstatgrab>=0.10
-BUILDLINK_RECOMMENDED.libstatgrab+= libstatgrab>=0.10.3nb1
+BUILDLINK_API_DEPENDS.libstatgrab+= libstatgrab>=0.10
+BUILDLINK_ABI_DEPENDS.libstatgrab+= libstatgrab>=0.10.3nb1
BUILDLINK_PKGSRCDIR.libstatgrab?= ../../devel/libstatgrab
.endif # LIBSTATGRAB_BUILDLINK3_MK
diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk
index 7f28fd90947..405d5f8bed0 100644
--- a/devel/libstroke/buildlink3.mk
+++ b/devel/libstroke/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBSTROKE_BUILDLINK3_MK:= ${LIBSTROKE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibstroke}
BUILDLINK_PACKAGES+= libstroke
.if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstroke+= libstroke>=0.5.1
-BUILDLINK_RECOMMENDED.libstroke+= libstroke>=0.5.1nb2
+BUILDLINK_API_DEPENDS.libstroke+= libstroke>=0.5.1
+BUILDLINK_ABI_DEPENDS.libstroke+= libstroke>=0.5.1nb2
BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke
.endif # LIBSTROKE_BUILDLINK3_MK
diff --git a/devel/libtar/buildlink3.mk b/devel/libtar/buildlink3.mk
index 5c7df57a76f..b3337b4060b 100644
--- a/devel/libtar/buildlink3.mk
+++ b/devel/libtar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTAR_BUILDLINK3_MK:= ${LIBTAR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtar}
BUILDLINK_PACKAGES+= libtar
.if !empty(LIBTAR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtar+= libtar>=1.2.11
+BUILDLINK_API_DEPENDS.libtar+= libtar>=1.2.11
BUILDLINK_PKGSRCDIR.libtar?= ../../devel/libtar
.endif # LIBTAR_BUILDLINK3_MK
diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk
index 25e13976b8a..ad20a8042ae 100644
--- a/devel/libtecla/buildlink3.mk
+++ b/devel/libtecla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBTECLA_BUILDLINK3_MK:= ${LIBTECLA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtecla}
BUILDLINK_PACKAGES+= libtecla
.if !empty(LIBTECLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtecla+= libtecla>=1.5.0
-BUILDLINK_RECOMMENDED.libtecla?= libtecla>=1.6.1nb1
+BUILDLINK_API_DEPENDS.libtecla+= libtecla>=1.5.0
+BUILDLINK_ABI_DEPENDS.libtecla?= libtecla>=1.6.1nb1
BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla
.endif # LIBTECLA_BUILDLINK3_MK
diff --git a/devel/libts/buildlink3.mk b/devel/libts/buildlink3.mk
index dc1e145d656..9efc891b2ee 100644
--- a/devel/libts/buildlink3.mk
+++ b/devel/libts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/31 01:03:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPMETHOD.libts?= build
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibts}
BUILDLINK_PACKAGES+= libts
.if !empty(LIBTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libts+= libts>=1.08
+BUILDLINK_API_DEPENDS.libts+= libts>=1.08
BUILDLINK_PKGSRCDIR.libts?= ../../devel/libts
.endif # LIBTS_BUILDLINK3_MK
diff --git a/devel/libusb/buildlink3.mk b/devel/libusb/buildlink3.mk
index 1a2e5882de1..534268c9b74 100644
--- a/devel/libusb/buildlink3.mk
+++ b/devel/libusb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/11 08:34:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUSB_BUILDLINK3_MK:= ${LIBUSB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibusb}
BUILDLINK_PACKAGES+= libusb
.if !empty(LIBUSB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libusb+= libusb>=0.1.7
-BUILDLINK_RECOMMENDED.libusb+= libusb>=0.1.8nb2
+BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.7
+BUILDLINK_ABI_DEPENDS.libusb+= libusb>=0.1.8nb2
BUILDLINK_PKGSRCDIR.libusb?= ../../devel/libusb
.endif # LIBUSB_BUILDLINK3_MK
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index bffee127fb8..92492c68835 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWNCK_BUILDLINK3_MK:= ${LIBWNCK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwnck}
BUILDLINK_PACKAGES+= libwnck
.if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwnck+= libwnck>=2.10.0
-BUILDLINK_RECOMMENDED.libwnck?= libwnck>=2.12.2nb2
+BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.10.0
+BUILDLINK_ABI_DEPENDS.libwnck?= libwnck>=2.12.2nb2
BUILDLINK_PKGSRCDIR.libwnck?= ../../devel/libwnck
.endif # LIBWNCK_BUILDLINK3_MK
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
index 765ac7ad094..5e032c19435 100644
--- a/devel/lwp/buildlink3.mk
+++ b/devel/lwp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LWP_BUILDLINK3_MK:= ${LWP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlwp}
BUILDLINK_PACKAGES+= lwp
.if !empty(LWP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lwp+= lwp>=1.6
-BUILDLINK_RECOMMENDED.lwp+= lwp>=1.10nb1
+BUILDLINK_API_DEPENDS.lwp+= lwp>=1.6
+BUILDLINK_ABI_DEPENDS.lwp+= lwp>=1.10nb1
BUILDLINK_PKGSRCDIR.lwp?= ../../devel/lwp
.endif # LWP_BUILDLINK3_MK
diff --git a/devel/nbitools/buildlink3.mk b/devel/nbitools/buildlink3.mk
index a07fd1e6391..f1d1e5fee42 100644
--- a/devel/nbitools/buildlink3.mk
+++ b/devel/nbitools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NBITOOLS_BUILDLINK3_MK:= ${NBITOOLS_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnbitools}
BUILDLINK_PACKAGES+= nbitools
.if !empty(NBITOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nbitools+= nbitools>=6.3
+BUILDLINK_API_DEPENDS.nbitools+= nbitools>=6.3
BUILDLINK_PKGSRCDIR.nbitools?= ../../devel/nbitools
BUILDLINK_DEPMETHOD.nbitools?= build
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 719b98f2100..d847c469bdc 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/06 06:21:53 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nncurses}
BUILDLINK_PACKAGES+= ncurses
.if !empty(NCURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ncurses+= ncurses>=5.3nb1
-BUILDLINK_RECOMMENDED.ncurses+= ncurses>=5.4nb1
+BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1
+BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1
BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses
.endif # NCURSES_BUILDLINK3_MK
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 674bf08b6df..3297d8aa5a2 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/04/04 19:11:33 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:21:54 reed Exp $
BUILTIN_PKG:= ncurses
@@ -53,7 +53,7 @@ USE_BUILTIN.ncurses= ${IS_BUILTIN.ncurses}
. if defined(BUILTIN_PKG.ncurses) && \
!empty(IS_BUILTIN.ncurses:M[yY][eE][sS])
USE_BUILTIN.ncurses= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.ncurses}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses}
. if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
USE_BUILTIN.ncurses!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \
diff --git a/devel/netcdf/buildlink3.mk b/devel/netcdf/buildlink3.mk
index 31a0407872e..f52f58c53fd 100644
--- a/devel/netcdf/buildlink3.mk
+++ b/devel/netcdf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:31 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETCDF_BUILDLINK3_MK:= ${NETCDF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetcdf}
BUILDLINK_PACKAGES+= netcdf
.if !empty(NETCDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netcdf+= netcdf>=3.5
-BUILDLINK_RECOMMENDED.netcdf+= netcdf>=3.5.0nb2
+BUILDLINK_API_DEPENDS.netcdf+= netcdf>=3.5
+BUILDLINK_ABI_DEPENDS.netcdf+= netcdf>=3.5.0nb2
BUILDLINK_PKGSRCDIR.netcdf?= ../../devel/netcdf
.endif # NETCDF_BUILDLINK3_MK
diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk
index c458f5c3065..6b4837408c5 100644
--- a/devel/newt/buildlink3.mk
+++ b/devel/newt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NEWT_BUILDLINK3_MK:= ${NEWT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnewt}
BUILDLINK_PACKAGES+= newt
.if !empty(NEWT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.newt+= newt>=0.51.6
-BUILDLINK_RECOMMENDED.newt?= newt>=0.51.6nb2
+BUILDLINK_API_DEPENDS.newt+= newt>=0.51.6
+BUILDLINK_ABI_DEPENDS.newt?= newt>=0.51.6nb2
BUILDLINK_PKGSRCDIR.newt?= ../../devel/newt
.endif # NEWT_BUILDLINK3_MK
diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk
index 53689973fbb..015107f4e24 100644
--- a/devel/nspr/buildlink3.mk
+++ b/devel/nspr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NSPR_BUILDLINK3_MK:= ${NSPR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnspr}
BUILDLINK_PACKAGES+= nspr
.if !empty(NSPR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1nb1
-BUILDLINK_RECOMMENDED.nspr+= nspr>=4.6.1nb1
+BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb1
+BUILDLINK_ABI_DEPENDS.nspr+= nspr>=4.6.1nb1
BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr
BUILDLINK_FILES.nspr+= lib/nspr/*
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 7d03d715996..e0ca39d2ec1 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:54 reed Exp $
DISTNAME= nss-3.9.2
PKGREVISION= 4
@@ -77,7 +77,7 @@ do-install:
"-lnss3 -lsmime3 -lssl3 -lsoftokn3 ${BUILDLINK_LIBS.pthread}"; \
} >${PREFIX}/lib/pkgconfig/nss.pc
-BUILDLINK_DEPENDS.nspr+= nspr>=4.4.1nb2
+BUILDLINK_API_DEPENDS.nspr+= nspr>=4.4.1nb2
.include "../../devel/nspr/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk
index b06ca0d4fae..ae049cdd4b6 100644
--- a/devel/nss/buildlink3.mk
+++ b/devel/nss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NSS_BUILDLINK3_MK:= ${NSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnss}
BUILDLINK_PACKAGES+= nss
.if !empty(NSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nss+= nss>=3.9.2nb1
-BUILDLINK_RECOMMENDED.nss+= nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+= nss>=3.9.2nb1
+BUILDLINK_ABI_DEPENDS.nss+= nss>=3.9.2nb4
BUILDLINK_PKGSRCDIR.nss?= ../../devel/nss
BUILDLINK_FILES.nss+= lib/nss/*
diff --git a/devel/oaf/buildlink3.mk b/devel/oaf/buildlink3.mk
index 1aee02f2234..957aba0f1cd 100644
--- a/devel/oaf/buildlink3.mk
+++ b/devel/oaf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OAF_BUILDLINK3_MK:= ${OAF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Noaf}
BUILDLINK_PACKAGES+= oaf
.if !empty(OAF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.oaf+= oaf>=0.6.10nb4
-BUILDLINK_RECOMMENDED.oaf+= oaf>=0.6.10nb7
+BUILDLINK_API_DEPENDS.oaf+= oaf>=0.6.10nb4
+BUILDLINK_ABI_DEPENDS.oaf+= oaf>=0.6.10nb7
BUILDLINK_PKGSRCDIR.oaf?= ../../devel/oaf
.endif # OAF_BUILDLINK3_MK
diff --git a/devel/ode/buildlink3.mk b/devel/ode/buildlink3.mk
index 8909fc337c9..7ecdedc9b2c 100644
--- a/devel/ode/buildlink3.mk
+++ b/devel/ode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 20:35:28 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ODE_BUILDLINK3_MK:= ${ODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Node}
BUILDLINK_PACKAGES+= ode
.if !empty(ODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ode+= ode>=0.5nb2
-BUILDLINK_RECOMMENDED.ode?= ode>=0.5nb2
+BUILDLINK_API_DEPENDS.ode+= ode>=0.5nb2
+BUILDLINK_ABI_DEPENDS.ode?= ode>=0.5nb2
BUILDLINK_PKGSRCDIR.ode?= ../../devel/ode
.endif # ODE_BUILDLINK3_MK
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index 6fba6bf9fff..89d9a13f9df 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:49 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OGRE_BUILDLINK3_MK:= ${OGRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nogre}
BUILDLINK_PACKAGES+= ogre
.if !empty(OGRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogre+= ogre>=0.12.1nb1
-BUILDLINK_RECOMMENDED.ogre+= ogre>=0.12.1nb6
+BUILDLINK_API_DEPENDS.ogre+= ogre>=0.12.1nb1
+BUILDLINK_ABI_DEPENDS.ogre+= ogre>=0.12.1nb6
BUILDLINK_PKGSRCDIR.ogre?= ../../devel/ogre
.endif # OGRE_BUILDLINK3_MK
diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk
index 08dbc4a9f8a..6aa4dd57a08 100644
--- a/devel/p5-glib2/buildlink3.mk
+++ b/devel/p5-glib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
P5_GLIB2_BUILDLINK3_MK:= ${P5_GLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Np5-glib2}
BUILDLINK_PACKAGES+= p5-glib2
.if !empty(P5_GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-glib2+= p5-glib2>=1.103
-BUILDLINK_RECOMMENDED.p5-glib2?= p5-glib2>=1.103nb1
+BUILDLINK_API_DEPENDS.p5-glib2+= p5-glib2>=1.103
+BUILDLINK_ABI_DEPENDS.p5-glib2?= p5-glib2>=1.103nb1
BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2
.endif # P5_GLIB2_BUILDLINK3_MK
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index da76de763ce..97dc9c3f967 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/03/14 19:50:15 tron Exp $
+# $NetBSD: Makefile,v 1.73 2006/04/06 06:21:54 reed Exp $
DISTNAME= pango-1.12.0
CATEGORIES= devel fonts
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+= --with-qt=no
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE:Q}
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index 2fcdbf43486..55083664459 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npango}
BUILDLINK_PACKAGES+= pango
.if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pango+= pango>=1.6.0
-BUILDLINK_RECOMMENDED.pango+= pango>=1.10.2nb2
+BUILDLINK_API_DEPENDS.pango+= pango>=1.6.0
+BUILDLINK_ABI_DEPENDS.pango+= pango>=1.10.2nb2
BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango
.endif # PANGO_BUILDLINK3_MK
diff --git a/devel/pccts/buildlink3.mk b/devel/pccts/buildlink3.mk
index 08000bf0d7d..6c7a3742144 100644
--- a/devel/pccts/buildlink3.mk
+++ b/devel/pccts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCCTS_BUILDLINK3_MK:= ${PCCTS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npccts}
BUILDLINK_PACKAGES+= pccts
.if !empty(PCCTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pccts+= pccts>=1.33.22
-BUILDLINK_RECOMMENDED.pccts?= pccts>=1.33.22nb1
+BUILDLINK_API_DEPENDS.pccts+= pccts>=1.33.22
+BUILDLINK_ABI_DEPENDS.pccts?= pccts>=1.33.22nb1
BUILDLINK_PKGSRCDIR.pccts?= ../../devel/pccts
BUILDLINK_DEPMETHOD.pccts?= build
.endif # PCCTS_BUILDLINK3_MK
diff --git a/devel/pcre++/buildlink3.mk b/devel/pcre++/buildlink3.mk
index f2c9b8b7df8..8b123a47254 100644
--- a/devel/pcre++/buildlink3.mk
+++ b/devel/pcre++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/26 22:09:50 zuntum Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE++_BUILDLINK3_MK:= ${PCRE++_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcrexx}
BUILDLINK_PACKAGES+= pcrexx
.if !empty(PCRE++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcrexx+= pcre++>=0.9.5
+BUILDLINK_API_DEPENDS.pcrexx+= pcre++>=0.9.5
BUILDLINK_PKGSRCDIR.pcrexx?= ../../devel/pcre++
.endif # PCRE++_BUILDLINK3_MK
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index 988d1b051e8..b15583eb6ff 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/08/30 12:34:07 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PCRE_BUILDLINK3_MK:= ${PCRE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npcre}
BUILDLINK_PACKAGES+= pcre
.if !empty(PCRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcre+= pcre>=3.4nb1
-BUILDLINK_RECOMMENDED.pcre+= pcre>=6.2
+BUILDLINK_API_DEPENDS.pcre+= pcre>=3.4nb1
+BUILDLINK_ABI_DEPENDS.pcre+= pcre>=6.2
BUILDLINK_PKGSRCDIR.pcre?= ../../devel/pcre
.endif # PCRE_BUILDLINK3_MK
diff --git a/devel/physfs/buildlink3.mk b/devel/physfs/buildlink3.mk
index daf7bd084f5..4a07ec86d92 100644
--- a/devel/physfs/buildlink3.mk
+++ b/devel/physfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/07/25 12:12:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:54 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PHYSFS_BUILDLINK3_MK:= ${PHYSFS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nphysfs}
BUILDLINK_PACKAGES+= physfs
.if !empty(PHYSFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.physfs+= physfs>=1.0.0
-BUILDLINK_RECOMMENDED.physfs+= physfs>=1.0.1
+BUILDLINK_API_DEPENDS.physfs+= physfs>=1.0.0
+BUILDLINK_ABI_DEPENDS.physfs+= physfs>=1.0.1
BUILDLINK_PKGSRCDIR.physfs?= ../../devel/physfs
.endif # PHYSFS_BUILDLINK3_MK
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 55ee1698549..0df0227ae78 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
POPT_BUILDLINK3_MK:= ${POPT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npopt}
BUILDLINK_PACKAGES+= popt
.if !empty(POPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.popt+= popt>=1.7nb3
-BUILDLINK_RECOMMENDED.popt+= popt>=1.7nb6
+BUILDLINK_API_DEPENDS.popt+= popt>=1.7nb3
+BUILDLINK_ABI_DEPENDS.popt+= popt>=1.7nb6
BUILDLINK_PKGSRCDIR.popt?= ../../devel/popt
.endif # POPT_BUILDLINK3_MK
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index b24b5f4bf58..b9f0b128a51 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:32 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTH_BUILDLINK3_MK:= ${PTH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npth}
BUILDLINK_PACKAGES+= pth
.if !empty(PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pth+= pth>=2.0.0
-BUILDLINK_RECOMMENDED.pth+= pth>=2.0.0nb2
+BUILDLINK_API_DEPENDS.pth+= pth>=2.0.0
+BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.0nb2
BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth
.endif # PTH_BUILDLINK3_MK
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index acaf80fe272..50c43b2a2a1 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PTHREAD_SEM_BUILDLINK3_MK:= ${PTHREAD_SEM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-sem}
BUILDLINK_PACKAGES+= pthread-sem
.if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-sem+= pthread-sem>=1.0
+BUILDLINK_API_DEPENDS.pthread-sem+= pthread-sem>=1.0
BUILDLINK_PKGSRCDIR.pthread-sem?= ../../devel/pthread-sem
.endif # PTHREAD_SEM_BUILDLINK3_MK
diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk
index d2e72fc9e81..5d960c4a167 100644
--- a/devel/pthread-stublib/buildlink3.mk
+++ b/devel/pthread-stublib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/03/23 11:40:30 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
# XXX
# XXX This file was created automatically using createbuildlink-3.10.
# XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npthread-stublib}
BUILDLINK_PACKAGES+= pthread-stublib
.if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-stublib+= pthread-stublib>=1.0
+BUILDLINK_API_DEPENDS.pthread-stublib+= pthread-stublib>=1.0
BUILDLINK_PKGSRCDIR.pthread-stublib?= ../../devel/pthread-stublib
.endif # PTHREAD_STUBLIB_BUILDLINK3_MK
diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk
index 3d5e9893785..f35d773e439 100644
--- a/devel/pwlib/buildlink3.mk
+++ b/devel/pwlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:50 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PWLIB_BUILDLINK3_MK:= ${PWLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npwlib}
BUILDLINK_PACKAGES+= pwlib
.if !empty(PWLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pwlib+= pwlib>=1.8.3nb1
-BUILDLINK_RECOMMENDED.pwlib?= pwlib>=1.8.3nb3
+BUILDLINK_API_DEPENDS.pwlib+= pwlib>=1.8.3nb1
+BUILDLINK_ABI_DEPENDS.pwlib?= pwlib>=1.8.3nb3
BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib
.endif # PWLIB_BUILDLINK3_MK
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index bc872482764..38352bafa1d 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/06 06:21:55 reed Exp $
#
PKGNAME= ${PYPKGPREFIX}-curses-0
@@ -20,7 +20,7 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
-BUILDLINK_DEPENDS.python23+= python23>=2.3nb2
+BUILDLINK_API_DEPENDS.python23+= python23>=2.3nb2
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
index 394901f1d3f..5c673d981d5 100644
--- a/devel/py-curses/buildlink3.mk
+++ b/devel/py-curses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_CURSES_BUILDLINK3_MK:= ${PY_CURSES_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycurses}
BUILDLINK_PACKAGES+= pycurses
.if !empty(PY_CURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]*
-BUILDLINK_RECOMMENDED.pycurses?= ${PYPKGPREFIX}-curses>=0nb4
+BUILDLINK_API_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycurses?= ${PYPKGPREFIX}-curses>=0nb4
BUILDLINK_PKGSRCDIR.pycurses?= ../../devel/py-curses
.endif # PY_CURSES_BUILDLINK3_MK
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
index 1e384787b68..2c4aaaee149 100644
--- a/devel/py-cursespanel/buildlink3.mk
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_CURSESPANEL_BUILDLINK3_MK:= ${PY_CURSESPANEL_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npycursespanel}
BUILDLINK_PACKAGES+= pycursespanel
.if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycursespanel+= ${PYPKGPREFIX}-cursespanel-[0-9]*
-BUILDLINK_RECOMMENDED.pycursespanel?= ${PYPKGPREFIX}-cursespanel>=0nb3
+BUILDLINK_API_DEPENDS.pycursespanel+= ${PYPKGPREFIX}-cursespanel-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycursespanel?= ${PYPKGPREFIX}-cursespanel>=0nb3
BUILDLINK_PKGSRCDIR.pycursespanel?= ../../devel/py-cursespanel
.endif # PY_CURSESPANEL_BUILDLINK3_MK
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index b3c0968000a..c59fbd8d995 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GAME_BUILDLINK3_MK:= ${PY_GAME_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:N${PYPKGPREFIX}-game}
BUILDLINK_PACKAGES+= ${PYPKGPREFIX}-game
.if !empty(PY_GAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.7.1nb2
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+= ${PYPKGPREFIX}-game>=1.6
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?= ${PYPKGPREFIX}-game>=1.7.1nb2
BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?= ../../devel/py-game
.include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk
index e143afd6d2a..f05f434fccb 100644
--- a/devel/py-gobject/buildlink3.mk
+++ b/devel/py-gobject/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/07 18:59:59 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_GOBJECT_BUILDLINK3_MK:= ${PY_GOBJECT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npygobject}
BUILDLINK_PACKAGES+= pygobject
.if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.9.1
+BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.9.1
BUILDLINK_PKGSRCDIR.pygobject?= ../../devel/py-gobject
.endif # PY_GOBJECT_BUILDLINK3_MK
diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk
index dfed2fcc0d5..177199f1bea 100644
--- a/devel/py-readline/buildlink3.mk
+++ b/devel/py-readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PYREADLINE_BUILDLINK3_MK:= ${PYREADLINE_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+= pyreadline
.include "../../lang/python/pyversion.mk"
-BUILDLINK_DEPENDS.pyreadline+= ${PYPKGPREFIX}-readline-[0-9]*
-BUILDLINK_RECOMMENDED.pyreadline?= ${PYPKGPREFIX}-readline>=0nb2
+BUILDLINK_API_DEPENDS.pyreadline+= ${PYPKGPREFIX}-readline-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreadline?= ${PYPKGPREFIX}-readline>=0nb2
BUILDLINK_PKGSRCDIR.pyreadline?= ../../devel/py-readline
.endif # PYREADLINE_BUILDLINK3_MK
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 71365d4bd9b..870adf22aa9 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2005/11/04 16:53:24 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:55 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
READLINE_BUILDLINK3_MK:= ${READLINE_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nreadline}
BUILDLINK_PACKAGES+= readline
.if !empty(READLINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.readline+= readline>=2.2
-BUILDLINK_RECOMMENDED.readline+= readline>=5.0
+BUILDLINK_API_DEPENDS.readline+= readline>=2.2
+BUILDLINK_ABI_DEPENDS.readline+= readline>=5.0
BUILDLINK_PKGSRCDIR.readline?= ../../devel/readline
BUILDLINK_FILES.readline+= include/history.h
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index 075a731ea28..0fffdfe6bd1 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:39:57 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:21:55 reed Exp $
BUILTIN_PKG:= readline
@@ -55,7 +55,7 @@ USE_BUILTIN.readline= ${IS_BUILTIN.readline}
. if defined(BUILTIN_PKG.readline) && \
!empty(IS_BUILTIN.readline:M[yY][eE][sS])
USE_BUILTIN.readline= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.readline}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.readline}
. if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
USE_BUILTIN.readline!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.readline:Q}; then \
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
index 7da97647e93..7b5cb2fc8b4 100644
--- a/devel/rpc2/buildlink3.mk
+++ b/devel/rpc2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RPC2_BUILDLINK3_MK:= ${RPC2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrpc2}
BUILDLINK_PACKAGES+= rpc2
.if !empty(RPC2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpc2+= rpc2>=1.10
-BUILDLINK_RECOMMENDED.rpc2+= rpc2>=1.27nb1
+BUILDLINK_API_DEPENDS.rpc2+= rpc2>=1.10
+BUILDLINK_ABI_DEPENDS.rpc2+= rpc2>=1.27nb1
BUILDLINK_PKGSRCDIR.rpc2?= ../../devel/rpc2
.endif # RPC2_BUILDLINK3_MK
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index ac9f6970c4d..d78218511a9 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_GNOME2_PANGO_BUILDLINK3_MK:= ${RUBY_GNOME2_PANGO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nruby-gnome2-pango}
BUILDLINK_PACKAGES+= ruby-gnome2-pango
.if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby-gnome2-pango+= ruby-gnome2-pango>=0.14.1
-BUILDLINK_RECOMMENDED.ruby-gnome2-pango?= ruby-gnome2-pango>=0.14.1nb2
+BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ruby-gnome2-pango>=0.14.1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?= ruby-gnome2-pango>=0.14.1nb2
BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango
.endif # RUBY_GNOME2_PANGO_BUILDLINK3_MK
diff --git a/devel/rudiments/buildlink3.mk b/devel/rudiments/buildlink3.mk
index efc9ac6678a..a0bc7bf5189 100644
--- a/devel/rudiments/buildlink3.mk
+++ b/devel/rudiments/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/11 02:41:51 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
#
# This Makefile fragment is included by packages that use rudiments.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= rudiments
.if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= rudiments
-BUILDLINK_DEPENDS.rudiments+= rudiments>=0.25.1
-BUILDLINK_RECOMMENDED.rudiments+= rudiments>=0.28.2nb1
+BUILDLINK_API_DEPENDS.rudiments+= rudiments>=0.25.1
+BUILDLINK_ABI_DEPENDS.rudiments+= rudiments>=0.28.2nb1
BUILDLINK_PKGSRCDIR.rudiments?= ../../devel/rudiments
.endif # RUDIMENTS_BUILDLINK3_MK
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
index 67d555ae118..4bcca887445 100644
--- a/devel/rvm/buildlink3.mk
+++ b/devel/rvm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RVM_BUILDLINK3_MK:= ${RVM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrvm}
BUILDLINK_PACKAGES+= rvm
.if !empty(RVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rvm+= rvm>=1.3
-BUILDLINK_RECOMMENDED.rvm+= rvm>=1.11nb1
+BUILDLINK_API_DEPENDS.rvm+= rvm>=1.3
+BUILDLINK_ABI_DEPENDS.rvm+= rvm>=1.11nb1
BUILDLINK_PKGSRCDIR.rvm?= ../../devel/rvm
.endif # RVM_BUILDLINK3_MK
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
index d4215c389ef..95926621fae 100644
--- a/devel/rx/buildlink3.mk
+++ b/devel/rx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RX_BUILDLINK3_MK:= ${RX_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nrx}
BUILDLINK_PACKAGES+= rx
.if !empty(RX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rx+= rx>=1.5
+BUILDLINK_API_DEPENDS.rx+= rx>=1.5
BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx
.endif # RX_BUILDLINK3_MK
diff --git a/devel/silc-toolkit/buildlink3.mk b/devel/silc-toolkit/buildlink3.mk
index 9dbcae91c51..06237065e65 100644
--- a/devel/silc-toolkit/buildlink3.mk
+++ b/devel/silc-toolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilc-toolkit}
BUILDLINK_PACKAGES+= silc-toolkit
.if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12
-BUILDLINK_RECOMMENDED.silc-toolkit+= silc-toolkit>=0.9.12nb1
+BUILDLINK_API_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12
+BUILDLINK_ABI_DEPENDS.silc-toolkit+= silc-toolkit>=0.9.12nb1
BUILDLINK_PKGSRCDIR.silc-toolkit?= ../../devel/silc-toolkit
.endif # SILC_TOOLKIT_BUILDLINK3_MK
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 2328ea0f697..817b133d045 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/05 01:42:00 epg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:21:56 reed Exp $
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
@@ -14,8 +14,8 @@ BUILD_DEFS+= PKG_BUILD_OPTIONS.apr
CONFIGURE_ARGS+= --without-apache
CONFIGURE_ARGS+= --without-apxs
-BUILDLINK_DEPENDS.apr+= apr>=0.9.5
-BUILDLINK_DEPENDS.neon+= neon>=0.24.7
+BUILDLINK_API_DEPENDS.apr+= apr>=0.9.5
+BUILDLINK_API_DEPENDS.neon+= neon>=0.24.7
.include "../../devel/apr/buildlink3.mk"
.include "../../www/neon/buildlink3.mk"
diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk
index d8ee57a3edf..b38b9863c79 100644
--- a/devel/subversion-base/buildlink3.mk
+++ b/devel/subversion-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/02/07 19:58:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsubversion-base}
BUILDLINK_PACKAGES+= subversion-base
.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.subversion-base+= subversion-base>=1.0.0
-BUILDLINK_RECOMMENDED.subversion-base?= subversion-base>=1.3.0nb2
+BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=1.0.0
+BUILDLINK_ABI_DEPENDS.subversion-base?= subversion-base>=1.3.0nb2
BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base
BUILDLINK_FILES.subversion-base+= bin/svn-config
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 3bfa3e262c6..964272c6b65 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2006/04/04 03:36:32 reed Exp $
+# $NetBSD: Makefile.common,v 1.24 2006/04/06 06:21:56 reed Exp $
DISTNAME= subversion-${SVNVER}
CATEGORIES= devel
@@ -27,6 +27,6 @@ CONFIGURE_ARGS+= --with-ssl
# workaround: does not install info file, but does create directory
CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR}
-BUILDLINK_DEPENDS.subversion-base+= subversion-base>=${SVNVER}
+BUILDLINK_API_DEPENDS.subversion-base+= subversion-base>=${SVNVER}
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/swig/buildlink3.mk b/devel/swig/buildlink3.mk
index 6ddf2738e6a..1c8f15a1c0b 100644
--- a/devel/swig/buildlink3.mk
+++ b/devel/swig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SWIG_BUILDLINK3_MK:= ${SWIG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nswig}
BUILDLINK_PACKAGES+= swig
.if !empty(SWIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swig+= swig>=1.3.24
-BUILDLINK_RECOMMENDED.swig?= swig>=1.3.24nb2
+BUILDLINK_API_DEPENDS.swig+= swig>=1.3.24
+BUILDLINK_ABI_DEPENDS.swig?= swig>=1.3.24nb2
BUILDLINK_PKGSRCDIR.swig?= ../../devel/swig
# only contains a static library
BUILDLINK_DEPMETHOD.swig?= build
diff --git a/devel/syncdir/buildlink3.mk b/devel/syncdir/buildlink3.mk
index bebf6d69038..213a838fb01 100644
--- a/devel/syncdir/buildlink3.mk
+++ b/devel/syncdir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYNCDIR_BUILDLINK3_MK:= ${SYNCDIR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsyncdir}
BUILDLINK_PACKAGES+= syncdir
.if !empty(SYNCDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.syncdir+= syncdir>=1.0
-BUILDLINK_RECOMMENDED.syncdir+= syncdir>=1.0nb1
+BUILDLINK_API_DEPENDS.syncdir+= syncdir>=1.0
+BUILDLINK_ABI_DEPENDS.syncdir+= syncdir>=1.0nb1
BUILDLINK_PKGSRCDIR.syncdir?= ../../devel/syncdir
.endif # SYNCDIR_BUILDLINK3_MK
diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk
index ff4088be5e2..5de4f98ef54 100644
--- a/devel/sysexits/buildlink3.mk
+++ b/devel/sysexits/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/11/08 13:34:39 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SYSEXITS_BUILDLINK3_MK:= ${SYSEXITS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsysexits}
BUILDLINK_PACKAGES+= sysexits
.if !empty(SYSEXITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sysexits+= sysexits>=1.1
+BUILDLINK_API_DEPENDS.sysexits+= sysexits>=1.1
BUILDLINK_DEPMETHOD.sysexits?= build
BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits
.endif # SYSEXITS_BUILDLINK3_MK
diff --git a/devel/sysexits/builtin.mk b/devel/sysexits/builtin.mk
index 741ff7d8d5f..dc0145156d0 100644
--- a/devel/sysexits/builtin.mk
+++ b/devel/sysexits/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILTIN_PKG:= sysexits
@@ -31,7 +31,7 @@ USE_BUILTIN.sysexits= ${IS_BUILTIN.sysexits}
. if defined(BUILTIN_PKG.sysexits) && \
!empty(IS_BUILTIN.sysexits:M[yY][eE][sS])
USE_BUILTIN.sysexits= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.sysexits}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.sysexits}
. if !empty(USE_BUILTIN.sysexits:M[yY][eE][sS])
USE_BUILTIN.sysexits!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.sysexits:Q}; then \
diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk
index f77cdeb292d..6eded7b33ac 100644
--- a/devel/tcl-tclcl/buildlink3.mk
+++ b/devel/tcl-tclcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_TCLCL_BUILDLINK3_MK:= ${TCL_TCLCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-tclcl}
BUILDLINK_PACKAGES+= tcl-tclcl
.if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15
-BUILDLINK_RECOMMENDED.tcl-tclcl+= tcl-tclcl>=1.17nb2
+BUILDLINK_API_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15
+BUILDLINK_ABI_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.17nb2
BUILDLINK_PKGSRCDIR.tcl-tclcl?= ../../devel/tcl-tclcl
.endif # TCL_TCLCL_BUILDLINK3_MK
diff --git a/devel/teem/buildlink3.mk b/devel/teem/buildlink3.mk
index 70b696d5e67..e5004087eb6 100644
--- a/devel/teem/buildlink3.mk
+++ b/devel/teem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TEEM_BUILDLINK3_MK:= ${TEEM_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nteem}
BUILDLINK_PACKAGES+= teem
.if !empty(TEEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teem+= teem>=1.8.0
-BUILDLINK_RECOMMENDED.teem?= teem>=1.8.0nb1
+BUILDLINK_API_DEPENDS.teem+= teem>=1.8.0
+BUILDLINK_ABI_DEPENDS.teem?= teem>=1.8.0nb1
BUILDLINK_PKGSRCDIR.teem?= ../../devel/teem
BUILDLINK_FILES.teem+= include/teem/*
diff --git a/devel/tre/buildlink3.mk b/devel/tre/buildlink3.mk
index 57c76d4e0cd..ac72743dac0 100644
--- a/devel/tre/buildlink3.mk
+++ b/devel/tre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/29 19:12:04 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TRE_BUILDLINK3_MK:= ${TRE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntre}
BUILDLINK_PACKAGES+= tre
.if !empty(TRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tre+= tre>=0.7.2
+BUILDLINK_API_DEPENDS.tre+= tre>=0.7.2
BUILDLINK_PKGSRCDIR.tre?= ../../devel/tre
BUILDLINK_DEPMETHOD.tre?= build
.endif # TRE_BUILDLINK3_MK
diff --git a/devel/ucl/buildlink3.mk b/devel/ucl/buildlink3.mk
index 0503bda6a51..ecd4384f1d0 100644
--- a/devel/ucl/buildlink3.mk
+++ b/devel/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
UCL_BUILDLINK3_MK:= ${UCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nucl}
BUILDLINK_PACKAGES+= ucl
.if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ucl+= ucl>=1.02
-BUILDLINK_RECOMMENDED.ucl+= ucl>=1.02nb2
+BUILDLINK_API_DEPENDS.ucl+= ucl>=1.02
+BUILDLINK_ABI_DEPENDS.ucl+= ucl>=1.02nb2
BUILDLINK_PKGSRCDIR.ucl?= ../../devel/ucl
.endif # UCL_BUILDLINK3_MK
diff --git a/devel/vanessa_adt/buildlink3.mk b/devel/vanessa_adt/buildlink3.mk
index 15cb65bd5fb..d464ad3376c 100644
--- a/devel/vanessa_adt/buildlink3.mk
+++ b/devel/vanessa_adt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_adt}
BUILDLINK_PACKAGES+= vanessa_adt
.if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6
-BUILDLINK_RECOMMENDED.vanessa_adt+= vanessa_adt>=0.0.6nb1
+BUILDLINK_API_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6
+BUILDLINK_ABI_DEPENDS.vanessa_adt+= vanessa_adt>=0.0.6nb1
BUILDLINK_PKGSRCDIR.vanessa_adt?= ../../devel/vanessa_adt
.endif # VANESSA_ADT_BUILDLINK3_MK
diff --git a/devel/vanessa_logger/buildlink3.mk b/devel/vanessa_logger/buildlink3.mk
index c125c1e36cb..2cd4c34620d 100644
--- a/devel/vanessa_logger/buildlink3.mk
+++ b/devel/vanessa_logger/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:56 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_logger}
BUILDLINK_PACKAGES+= vanessa_logger
.if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7
-BUILDLINK_RECOMMENDED.vanessa_logger+= vanessa_logger>=0.0.7nb1
+BUILDLINK_API_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7
+BUILDLINK_ABI_DEPENDS.vanessa_logger+= vanessa_logger>=0.0.7nb1
BUILDLINK_PKGSRCDIR.vanessa_logger?= ../../devel/vanessa_logger
.endif # VANESSA_LOGGER_BUILDLINK3_MK
diff --git a/devel/vanessa_socket/buildlink3.mk b/devel/vanessa_socket/buildlink3.mk
index df80c3748c0..86980b275d9 100644
--- a/devel/vanessa_socket/buildlink3.mk
+++ b/devel/vanessa_socket/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:57 reed Exp $
#
# This file was created automatically using createbuildlink-3.5.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nvanessa_socket}
BUILDLINK_PACKAGES+= vanessa_socket
.if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_socket+= vanessa_socket>=0.0.7nb2
-BUILDLINK_RECOMMENDED.vanessa_socket?= vanessa_socket>=0.0.7nb3
+BUILDLINK_API_DEPENDS.vanessa_socket+= vanessa_socket>=0.0.7nb2
+BUILDLINK_ABI_DEPENDS.vanessa_socket?= vanessa_socket>=0.0.7nb3
BUILDLINK_PKGSRCDIR.vanessa_socket?= ../../devel/vanessa_socket
.endif # VANESSA_SOCKET_BUILDLINK3_MK
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index c94b0b636ea..e84fcfe97f5 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2005/07/22 16:04:43 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:57 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nzlib}
BUILDLINK_PACKAGES+= zlib
.if !empty(ZLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zlib+= zlib>=1.1.4nb1
-BUILDLINK_RECOMMENDED.zlib+= zlib>=1.2.3
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.zlib+= zlib>=1.2.3
BUILDLINK_PKGSRCDIR.zlib?= ../../devel/zlib
.endif # ZLIB_BUILDLINK3_MK
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index 26080ad9a86..ddfd89f581c 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:21:57 reed Exp $
BUILTIN_PKG:= zlib
@@ -69,7 +69,7 @@ USE_BUILTIN.zlib= ${IS_BUILTIN.zlib}
. if defined(BUILTIN_PKG.zlib) && \
!empty(IS_BUILTIN.zlib:M[yY][eE][sS])
USE_BUILTIN.zlib= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.zlib}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.zlib}
. if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
USE_BUILTIN.zlib!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.zlib:Q}; then \