Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

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

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

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

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

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

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

As discussed on tech-pkg.

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

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

77 files changed, 189 insertions, 189 deletions

diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk
index 6a31a40128a..186773322ce 100644
--- a/net/GeoIP/buildlink3.mk
+++ b/net/GeoIP/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:17:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEOIP_BUILDLINK3_MK:=	${GEOIP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeoIP}
 BUILDLINK_PACKAGES+=	GeoIP
 
 .if !empty(GEOIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GeoIP+=	GeoIP>=1.3.1
-BUILDLINK_RECOMMENDED.GeoIP+=	GeoIP>=1.3.4nb1
+BUILDLINK_API_DEPENDS.GeoIP+=	GeoIP>=1.3.1
+BUILDLINK_ABI_DEPENDS.GeoIP+=	GeoIP>=1.3.4nb1
 BUILDLINK_PKGSRCDIR.GeoIP?=	../../net/GeoIP
 .endif	# GEOIP_BUILDLINK3_MK
 
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index 6f9675fa1a7..5b808199c71 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT_BUILDLINK3_MK:=	${ORBIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit}
 BUILDLINK_PACKAGES+=	ORBit
 
 .if !empty(ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
-BUILDLINK_RECOMMENDED.ORBit+=	ORBit>=0.5.17nb1
+BUILDLINK_API_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
+BUILDLINK_ABI_DEPENDS.ORBit+=	ORBit>=0.5.17nb1
 BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
 .endif	# ORBIT_BUILDLINK3_MK
 
diff --git a/net/ORBit2/buildlink3.mk b/net/ORBit2/buildlink3.mk
index 1031fd65a25..036968caeeb 100644
--- a/net/ORBit2/buildlink3.mk
+++ b/net/ORBit2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ORBIT2_BUILDLINK3_MK:=	${ORBIT2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NORBit2}
 BUILDLINK_PACKAGES+=	ORBit2
 
 .if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit2+=	ORBit2>=2.12.0
-BUILDLINK_RECOMMENDED.ORBit2?=	ORBit2>=2.12.4nb1
+BUILDLINK_API_DEPENDS.ORBit2+=	ORBit2>=2.12.0
+BUILDLINK_ABI_DEPENDS.ORBit2?=	ORBit2>=2.12.4nb1
 BUILDLINK_PKGSRCDIR.ORBit2?=	../../net/ORBit2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/orbit-2.0$$/ \
diff --git a/net/SDL_net/buildlink3.mk b/net/SDL_net/buildlink3.mk
index e3405818b01..d2d6b52a750 100644
--- a/net/SDL_net/buildlink3.mk
+++ b/net/SDL_net/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_NET_BUILDLINK3_MK:=	${SDL_NET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_net}
 BUILDLINK_PACKAGES+=	SDL_net
 
 .if !empty(SDL_NET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
-BUILDLINK_RECOMMENDED.SDL_net+=	SDL_net>=1.2.5nb5
+BUILDLINK_API_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
+BUILDLINK_ABI_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net
 .endif	# SDL_NET_BUILDLINK3_MK
 
diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk
index ba4602bc493..a2e0f932c6c 100644
--- a/net/adns/buildlink3.mk
+++ b/net/adns/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ADNS_BUILDLINK3_MK:=	${ADNS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nadns}
 BUILDLINK_PACKAGES+=	adns
 
 .if !empty(ADNS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.adns+=	adns>=1.0
-BUILDLINK_RECOMMENDED.adns+=	adns>=1.1nb2
+BUILDLINK_API_DEPENDS.adns+=	adns>=1.0
+BUILDLINK_ABI_DEPENDS.adns+=	adns>=1.1nb2
 BUILDLINK_PKGSRCDIR.adns?=	../../net/adns
 .endif	# ADNS_BUILDLINK3_MK
 
diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk
index ff47e288e6f..c84b614dad1 100644
--- a/net/bind9/buildlink3.mk
+++ b/net/bind9/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BIND_BUILDLINK3_MK:=	${BIND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbind}
 BUILDLINK_PACKAGES+=	bind
 
 .if !empty(BIND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bind+=	bind>=9.2.2
-BUILDLINK_RECOMMENDED.bind+=	bind>=9.2.3nb5
+BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.2
+BUILDLINK_ABI_DEPENDS.bind+=	bind>=9.2.3nb5
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind9
 
 BUILDLINK_INCDIRS.bind?=	include/bind
diff --git a/net/bind9/builtin.mk b/net/bind9/builtin.mk
index a7597d7bb72..08a1d3240b0 100644
--- a/net/bind9/builtin.mk
+++ b/net/bind9/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:30 reed Exp $
 
 BUILTIN_PKG:=	bind
 
@@ -59,7 +59,7 @@ USE_BUILTIN.bind=	${IS_BUILTIN.bind}
 .    if defined(BUILTIN_PKG.bind) && \
         !empty(IS_BUILTIN.bind:M[yY][eE][sS])
 USE_BUILTIN.bind=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.bind}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.bind}
 .        if !empty(USE_BUILTIN.bind:M[yY][eE][sS])
 USE_BUILTIN.bind!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bind:Q}; then	\
diff --git a/net/boinc3-libs/buildlink3.mk b/net/boinc3-libs/buildlink3.mk
index 02f35531136..79ef31f9e88 100644
--- a/net/boinc3-libs/buildlink3.mk
+++ b/net/boinc3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/07/19 20:11:04 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOINC_LIBS_BUILDLINK3_MK:=	${BOINC_LIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nboinclibs}
 BUILDLINK_PACKAGES+=	boinclibs
 
 .if !empty(BOINC_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
+BUILDLINK_API_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
 BUILDLINK_PKGSRCDIR.boinclibs?=	../../net/boinc3-libs
 
 # installs static libraries only
diff --git a/net/btpd/Makefile b/net/btpd/Makefile
index e0386b66eb6..7bb92527b9d 100644
--- a/net/btpd/Makefile
+++ b/net/btpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/22 22:09:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:30 reed Exp $
 
 DISTNAME=	btpd-0.8
 CATEGORIES=	net
@@ -9,7 +9,7 @@ MAINTAINER=	rnyberg@murmeldjur.se
 HOMEPAGE=	http://www.murmeldjur.se/btpd/
 COMMENT=	Daemon for file sharing over bittorrent
 
-BUILDLINK_DEPENDS.libevent+=	libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=0.9
 
 GNU_CONFIGURE=	YES
 
diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index aa03ca41d42..b09284f1a1a 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:24 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:31 reed Exp $
 #
 
 DISTNAME=	cdpd-1.0.2
@@ -11,7 +11,7 @@ COMMENT=	Simple daemon to send Cisco Discovery Protocol packets
 
 GNU_CONFIGURE=	YES
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 INSTALLATION_DIRS=	man/man8 sbin
 
diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk
index c59fcc4e039..0b9e314cd56 100644
--- a/net/dante/buildlink3.mk
+++ b/net/dante/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:31 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DANTE_BUILDLINK3_MK:=	${DANTE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndante}
 BUILDLINK_PACKAGES+=	dante
 
 .if !empty(DANTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dante+=	dante>=1.1.13
-BUILDLINK_RECOMMENDED.dante+=	dante>=1.1.14nb1
+BUILDLINK_API_DEPENDS.dante+=	dante>=1.1.13
+BUILDLINK_ABI_DEPENDS.dante+=	dante>=1.1.14nb1
 BUILDLINK_PKGSRCDIR.dante?=	../../net/dante
 .endif	# DANTE_BUILDLINK3_MK
 
diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile
index 97ec97ada6c..696a24a7da7 100644
--- a/net/ettercap-NG/Makefile
+++ b/net/ettercap-NG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:58 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:32 reed Exp $
 
 DISTNAME=	ettercap-NG-0.7.3
 CATEGORIES=	net
@@ -10,7 +10,7 @@ COMMENT=	Multipurpose sniffer/interceptor/logger for switched LAN
 
 CONFLICTS=	ettercap-[0-9]*
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.1
 
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 95a5a93b94a..a373a024d18 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:32 reed Exp $
 
 DISTNAME=	firewalk-5.0
 PKGREVISION=	1
@@ -14,7 +14,7 @@ WRKSRC=         ${WRKDIR}/Firewalk
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.1.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.1.*
 
 MAKE_ENV+=	FIREWALK_LOC=${PREFIX:Q}
 
diff --git a/net/flodo/Makefile b/net/flodo/Makefile
index f5518e0461a..73cbc11e136 100644
--- a/net/flodo/Makefile
+++ b/net/flodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:32 reed Exp $
 #
 
 DISTNAME=		flodo-v4
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://arctic.org/~dean/flodo/
 COMMENT=		Simple network flow sampling tool
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libpcap}/include
 LDFLAGS+=		-L${BUILDLINK_PREFIX.libpcap}/lib
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index a5a9c955f91..8398a47bfc9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/03/22 20:53:41 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/06 06:22:32 reed Exp $
 
 DISTNAME=	freeradius-1.1.1
 PKGREVISION=	2
@@ -20,7 +20,7 @@ FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP:Q}
 USE_OLD_DES_API=	YES
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	libtool
diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk
index 2c82336cb2d..c47c73d9314 100644
--- a/net/freewais-sf/buildlink3.mk
+++ b/net/freewais-sf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:51 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREEWAIS_SF_BUILDLINK3_MK:=	${FREEWAIS_SF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreewais-sf}
 BUILDLINK_PACKAGES+=	freewais-sf
 
 .if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
-BUILDLINK_RECOMMENDED.freewais-sf+=	freewais-sf>=2.2.12nb2
+BUILDLINK_API_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
+BUILDLINK_ABI_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.freewais-sf?=	../../net/freewais-sf
 .endif	# FREEWAIS_SF_BUILDLINK3_MK
 
diff --git a/net/gift/buildlink3.mk b/net/gift/buildlink3.mk
index edc566aa49f..771dfa213b0 100644
--- a/net/gift/buildlink3.mk
+++ b/net/gift/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/15 12:14:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GIFT_BUILDLINK3_MK:=	${GIFT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngift}
 BUILDLINK_PACKAGES+=	gift
 
 .if !empty(GIFT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gift+=	gift>=0.11.6
-BUILDLINK_RECOMMENDED.gift+=	gift>=0.11.6nb2
+BUILDLINK_API_DEPENDS.gift+=	gift>=0.11.6
+BUILDLINK_ABI_DEPENDS.gift+=	gift>=0.11.6nb2
 BUILDLINK_PKGSRCDIR.gift?=	../../net/gift
 .endif	# GIFT_BUILDLINK3_MK
 
diff --git a/net/gnet/buildlink3.mk b/net/gnet/buildlink3.mk
index 1eb5dc00cdf..21cde30b296 100644
--- a/net/gnet/buildlink3.mk
+++ b/net/gnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET_BUILDLINK3_MK:=	${GNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet}
 BUILDLINK_PACKAGES+=	gnet
 
 .if !empty(GNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet+=	gnet>=2.0.3nb1
-BUILDLINK_RECOMMENDED.gnet+=	gnet>=2.0.7nb2
+BUILDLINK_API_DEPENDS.gnet+=	gnet>=2.0.3nb1
+BUILDLINK_ABI_DEPENDS.gnet+=	gnet>=2.0.7nb2
 BUILDLINK_PKGSRCDIR.gnet?=	../../net/gnet
 .endif	# GNET_BUILDLINK3_MK
 
diff --git a/net/gnet1/buildlink3.mk b/net/gnet1/buildlink3.mk
index c39a3afe927..8d1532d95c5 100644
--- a/net/gnet1/buildlink3.mk
+++ b/net/gnet1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:25 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNET1_BUILDLINK3_MK:=	${GNET1_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnet1}
 BUILDLINK_PACKAGES+=	gnet1
 
 .if !empty(GNET1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
-BUILDLINK_RECOMMENDED.gnet1+=	gnet1>=1.1.8nb4
+BUILDLINK_API_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
+BUILDLINK_ABI_DEPENDS.gnet1+=	gnet1>=1.1.8nb4
 BUILDLINK_PKGSRCDIR.gnet1?=	../../net/gnet1
 .endif	# GNET1_BUILDLINK3_MK
 
diff --git a/net/hesiod/buildlink3.mk b/net/hesiod/buildlink3.mk
index 48ec16b3d9d..e7c2b67ad66 100644
--- a/net/hesiod/buildlink3.mk
+++ b/net/hesiod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/04/25 00:34:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HESIOD_BUILDLINK3_MK:=	${HESIOD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nhesiod}
 BUILDLINK_PACKAGES+=	hesiod
 
 .if !empty(HESIOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hesiod+=	hesiod>=3.0.2
+BUILDLINK_API_DEPENDS.hesiod+=	hesiod>=3.0.2
 BUILDLINK_PKGSRCDIR.hesiod?=	../../net/hesiod
 BUILDLINK_DEPMETHOD.hesiod?=	build
 .endif	# HESIOD_BUILDLINK3_MK
diff --git a/net/howl/buildlink3.mk b/net/howl/buildlink3.mk
index 2eff3ae6d09..3b75af6cae2 100644
--- a/net/howl/buildlink3.mk
+++ b/net/howl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/12 05:26:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 HOWL_BUILDLINK3_MK:=		${HOWL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nhowl}
 BUILDLINK_PACKAGES+=		howl
 
 .if !empty(HOWL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.howl+=	howl>=0.9.5
-BUILDLINK_RECOMMENDED.howl+=	howl>=0.9.5nb1
+BUILDLINK_API_DEPENDS.howl+=	howl>=0.9.5
+BUILDLINK_ABI_DEPENDS.howl+=	howl>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.howl?=	../../net/howl
 .endif	# HOWL_BUILDLINK3_MK
 
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index 4dc56717ef5..eb936ae8f6a 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDENETWORK_BUILDLINK3_MK:=	${KDENETWORK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdenetwork}
 BUILDLINK_PACKAGES+=	kdenetwork
 
 .if !empty(KDENETWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdenetwork?=	kdenetwork>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdenetwork?=	kdenetwork>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
 .endif	# KDENETWORK_BUILDLINK3_MK
 
diff --git a/net/libIDL/buildlink3.mk b/net/libIDL/buildlink3.mk
index e5aff59f629..5700a6bd942 100644
--- a/net/libIDL/buildlink3.mk
+++ b/net/libIDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBIDL_BUILDLINK3_MK:=	${LIBIDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NlibIDL}
 BUILDLINK_PACKAGES+=	libIDL
 
 .if !empty(LIBIDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
-BUILDLINK_RECOMMENDED.libIDL+=	libIDL>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.libIDL+=	libIDL>=0.8.6nb1
 BUILDLINK_PKGSRCDIR.libIDL?=	../../net/libIDL
 .endif	# LIBIDL_BUILDLINK3_MK
 
diff --git a/net/libares/buildlink3.mk b/net/libares/buildlink3.mk
index f052b339ea4..e1224908189 100644
--- a/net/libares/buildlink3.mk
+++ b/net/libares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/12 05:42:48 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBARES_BUILDLINK3_MK:=	${LIBARES_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES+=	libares
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(LIBARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libares+=	libares>=1.1.1
+BUILDLINK_API_DEPENDS.libares+=	libares>=1.1.1
 BUILDLINK_PKGSRCDIR.libares?=	../../net/libares
 BUILDLINK_DEPMETHOD.libares?=	build
 .endif	# LIBARES_BUILDLINK3_MK
diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk
index 691eaf19d67..0072505729c 100644
--- a/net/libcares/buildlink3.mk
+++ b/net/libcares/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/12/01 17:27:10 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCARES_BUILDLINK3_MK:=	${LIBCARES_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcares}
 BUILDLINK_PACKAGES+=	libcares
 
 .if !empty(LIBCARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcares+=	libcares>=1.3.0
+BUILDLINK_API_DEPENDS.libcares+=	libcares>=1.3.0
 BUILDLINK_PKGSRCDIR.libcares?=	../../net/libcares
 .endif	# LIBCARES_BUILDLINK3_MK
 
diff --git a/net/libdnet/buildlink3.mk b/net/libdnet/buildlink3.mk
index 083c042e475..a36cfac687c 100644
--- a/net/libdnet/buildlink3.mk
+++ b/net/libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDNET_BUILDLINK3_MK:=	${LIBDNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdnet}
 BUILDLINK_PACKAGES+=	libdnet
 
 .if !empty(LIBDNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnet+=	libdnet>=1.7
-BUILDLINK_RECOMMENDED.libdnet?=	libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.libdnet+=	libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.libdnet?=	libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.libdnet?=	../../net/libdnet
 .endif	# LIBDNET_BUILDLINK3_MK
 
diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk
index 34131f6ab62..d8b75ca4950 100644
--- a/net/liblive/buildlink3.mk
+++ b/net/liblive/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:17:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLIVE_BUILDLINK3_MK:=	${LIBLIVE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblive}
 BUILDLINK_PACKAGES+=	liblive
 
 .if !empty(LIBLIVE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liblive+=	liblive>=2003.04.04
-BUILDLINK_RECOMMENDED.liblive+=	liblive>=2003.04.04nb1
+BUILDLINK_API_DEPENDS.liblive+=	liblive>=2003.04.04
+BUILDLINK_ABI_DEPENDS.liblive+=	liblive>=2003.04.04nb1
 BUILDLINK_PKGSRCDIR.liblive?=	../../net/liblive
 .endif	# LIBLIVE_BUILDLINK3_MK
 
diff --git a/net/libnids/buildlink3.mk b/net/libnids/buildlink3.mk
index e5c3183fca4..afcba515e30 100644
--- a/net/libnids/buildlink3.mk
+++ b/net/libnids/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 04:25:11 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBNIDS_BUILDLINK3_MK:=	${LIBNIDS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnids}
 BUILDLINK_PACKAGES+=	libnids
 
 .if !empty(LIBNIDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnids+=	libnids>=1.18
+BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.18
 BUILDLINK_PKGSRCDIR.libnids?=	../../net/libnids
 BUILDLINK_DEPMETHOD.libnids?=	build
 .endif	# LIBNIDS_BUILDLINK3_MK
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk
index 6e5664da549..7045eecfea6 100644
--- a/net/libpcap/buildlink3.mk
+++ b/net/libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2005/01/12 15:44:12 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBPCAP_BUILDLINK3_MK:=	${LIBPCAP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	libpcap
 
 .if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 # XXX?
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.5.0
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.5.0
 BUILDLINK_PKGSRCDIR.libpcap?=	../../net/libpcap
 
 # on Solaris, we always need libnsl and libsocket because libpcap.a
diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk
index cc808181ce0..5eb94001dab 100644
--- a/net/libpcap/builtin.mk
+++ b/net/libpcap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:33 reed Exp $
 
 BUILTIN_PKG:=	libpcap
 
@@ -82,7 +82,7 @@ USE_BUILTIN.libpcap=	${IS_BUILTIN.libpcap}
 .    if defined(BUILTIN_PKG.libpcap) && \
         !empty(IS_BUILTIN.libpcap:M[yY][eE][sS])
 USE_BUILTIN.libpcap=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libpcap}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap}
 .        if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS])
 USE_BUILTIN.libpcap!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \
diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk
index cf11fce7f03..98df5446f61 100644
--- a/net/libradius/buildlink3.mk
+++ b/net/libradius/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/11/11 11:57:47 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBRADIUS_LINUX_BUILDLINK3_MK:=	${LIBRADIUS_LINUX_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibradius}
 BUILDLINK_PACKAGES+=	libradius
 
 .if !empty(LIBRADIUS_LINUX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libradius+=	libradius>=20040827
+BUILDLINK_API_DEPENDS.libradius+=	libradius>=20040827
 BUILDLINK_PKGSRCDIR.libradius?=	../../net/libradius
 BUILDLINK_DEPMETHOD.libradius?=	build
 
diff --git a/net/libsoup-devel/buildlink3.mk b/net/libsoup-devel/buildlink3.mk
index ee9db711cb5..0979426df11 100644
--- a/net/libsoup-devel/buildlink3.mk
+++ b/net/libsoup-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSOUP_DEVEL_BUILDLINK3_MK:=	${LIBSOUP_DEVEL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup-devel}
 BUILDLINK_PACKAGES+=	libsoup-devel
 
 .if !empty(LIBSOUP_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.0
-BUILDLINK_RECOMMENDED.libsoup-devel?=	libsoup-devel>=2.2.7nb1
+BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.0
+BUILDLINK_ABI_DEPENDS.libsoup-devel?=	libsoup-devel>=2.2.7nb1
 BUILDLINK_PKGSRCDIR.libsoup-devel?=	../../net/libsoup-devel
 .endif	# LIBSOUP_DEVEL_BUILDLINK3_MK
 
diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk
index a889ee489c3..541919d306a 100644
--- a/net/libsoup/buildlink3.mk
+++ b/net/libsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBSOUP_BUILDLINK3_MK:=	${LIBSOUP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsoup}
 BUILDLINK_PACKAGES+=	libsoup
 
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
-BUILDLINK_RECOMMENDED.libsoup?=	libsoup>=1.99.28nb4
+BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
+BUILDLINK_ABI_DEPENDS.libsoup?=	libsoup>=1.99.28nb4
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 .endif	# LIBSOUP_BUILDLINK3_MK
 
diff --git a/net/libtorrent/buildlink3.mk b/net/libtorrent/buildlink3.mk
index 36e7b3fb9ed..69a89aa14d4 100644
--- a/net/libtorrent/buildlink3.mk
+++ b/net/libtorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/03 15:30:53 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTORRENT_BUILDLINK3_MK:=	${LIBTORRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtorrent}
 BUILDLINK_PACKAGES+=	libtorrent
 
 .if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtorrent+=		libtorrent>=0.8.0
-BUILDLINK_RECOMMENDED.libtorrent+=	libtorrent>=0.8.5nb1
+BUILDLINK_API_DEPENDS.libtorrent+=		libtorrent>=0.8.0
+BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.8.5nb1
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
 .endif	# LIBTORRENT_BUILDLINK3_MK
 
diff --git a/net/linc/buildlink3.mk b/net/linc/buildlink3.mk
index ca2fd306a4f..e7f121420e2 100644
--- a/net/linc/buildlink3.mk
+++ b/net/linc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LINC_BUILDLINK3_MK:=	${LINC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinc}
 BUILDLINK_PACKAGES+=	linc
 
 .if !empty(LINC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linc+=	linc>=1.1.1
-BUILDLINK_RECOMMENDED.linc+=	linc>=1.1.1nb3
+BUILDLINK_API_DEPENDS.linc+=	linc>=1.1.1
+BUILDLINK_ABI_DEPENDS.linc+=	linc>=1.1.1nb3
 BUILDLINK_PKGSRCDIR.linc?=	../../net/linc
 .endif	# LINC_BUILDLINK3_MK
 
diff --git a/net/mDNSResponder/buildlink3.mk b/net/mDNSResponder/buildlink3.mk
index 879c6a7ae3d..013c879f140 100644
--- a/net/mDNSResponder/buildlink3.mk
+++ b/net/mDNSResponder/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MDNSRESPONDER_BUILDLINK3_MK:=	${MDNSRESPONDER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NmDNSResponder}
 BUILDLINK_PACKAGES+=	mDNSResponder
 
 .if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mDNSResponder+=	mDNSResponder>=98
-BUILDLINK_RECOMMENDED.mDNSResponder?=	mDNSResponder>=107.5nb1
+BUILDLINK_API_DEPENDS.mDNSResponder+=	mDNSResponder>=98
+BUILDLINK_ABI_DEPENDS.mDNSResponder?=	mDNSResponder>=107.5nb1
 BUILDLINK_PKGSRCDIR.mDNSResponder?=	../../net/mDNSResponder
 .endif	# MDNSRESPONDER_BUILDLINK3_MK
 
diff --git a/net/mldonkey-gui/options.mk b/net/mldonkey-gui/options.mk
index 610dcb01d48..0d3b7901189 100644
--- a/net/mldonkey-gui/options.mk
+++ b/net/mldonkey-gui/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/11/01 21:48:22 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2006/04/06 06:22:33 reed Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mldonkey-gui
 PKG_OPTIONS_REQUIRED_GROUPS+=	toolkit
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+=	--enable-gui=newgui2
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 # 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
+BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
 .include "../../x11/lablgtk2/buildlink3.mk"
 .endif
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 3c555d7b614..6d7f56618e9 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:33 reed Exp $
 
 DISTNAME=	nemesis-1.4
 CATEGORIES=	net
@@ -10,7 +10,7 @@ COMMENT=	Nemesis is a command-line UNIX network packet injection suite
 
 GNU_CONFIGURE=  yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.2a
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.2a
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libnet/buildlink3.mk"
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
index 9eee157b06b..f1b74d812cd 100644
--- a/net/net-snmp/buildlink3.mk
+++ b/net/net-snmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 22:16:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NET_SNMP_BUILDLINK3_MK:=	${NET_SNMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnet-snmp}
 BUILDLINK_PACKAGES+=	net-snmp
 
 .if !empty(NET_SNMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
-BUILDLINK_RECOMMENDED.net-snmp+=	net-snmp>=5.2.1.2
+BUILDLINK_API_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
+BUILDLINK_ABI_DEPENDS.net-snmp+=	net-snmp>=5.2.1.2
 BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
 .endif	# NET_SNMP_BUILDLINK3_MK
 
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index fcd645bf0f4..fb653cb6179 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
-BUILDLINK_RECOMMENDED.netatalk?=	netatalk>=2.0.3nb3
+BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.netatalk?=	netatalk>=2.0.3nb3
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
 BUILDLINK_DEPMETHOD.netatalk?=	build
 .endif	# NETATALK_BUILDLINK3_MK
diff --git a/net/netatalk1/buildlink3.mk b/net/netatalk1/buildlink3.mk
index 254d6b1beee..c41452d750c 100644
--- a/net/netatalk1/buildlink3.mk
+++ b/net/netatalk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGESNnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=1.6.2
-BUILDLINK_RECOMMENDED.netatalk+=	netatalk>=1.6.4anb1
+BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=1.6.2
+BUILDLINK_ABI_DEPENDS.netatalk+=	netatalk>=1.6.4anb1
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk1
 .endif	# NETATALK_BUILDLINK3_MK
 
diff --git a/net/netbsd-tap/buildlink3.mk b/net/netbsd-tap/buildlink3.mk
index d74e7661daf..c69b5ecef9f 100644
--- a/net/netbsd-tap/buildlink3.mk
+++ b/net/netbsd-tap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/02/20 21:50:57 cube Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETBSD_TAP_BUILDLINK3_MK:=	${NETBSD_TAP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetbsd-tap}
 BUILDLINK_PACKAGES+=	netbsd-tap
 
 .if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netbsd-tap+=	netbsd-tap>=20050120
+BUILDLINK_API_DEPENDS.netbsd-tap+=	netbsd-tap>=20050120
 BUILDLINK_PKGSRCDIR.netbsd-tap?=	../../net/netbsd-tap
 .endif	# NETBSD_TAP_BUILDLINK3_MK
 
diff --git a/net/netbsd-tap/builtin.mk b/net/netbsd-tap/builtin.mk
index ff2670ea28f..f3d7c6f3f5b 100644
--- a/net/netbsd-tap/builtin.mk
+++ b/net/netbsd-tap/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
 
 BUILTIN_PKG:=	netbsd-tap
 
@@ -32,7 +32,7 @@ USE_BUILTIN.netbsd-tap=	${IS_BUILTIN.netbsd-tap}
 .    if defined(BUILTIN_PKG.netbsd-tap) && \
         !empty(IS_BUILTIN.netbsd-tap:M[yY][eE][sS])
 USE_BUILTIN.netbsd-tap=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.netbsd-tap}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.netbsd-tap}
 .        if !empty(USE_BUILTIN.netbsd-tap:M[yY][eE][sS])
 USE_BUILTIN.netbsd-tap!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.netbsd-tap:Q}; then \
diff --git a/net/ns/Makefile b/net/ns/Makefile
index f89a71b2bff..8797b648a05 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/23 23:37:47 minskim Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:22:34 reed Exp $
 
 DISTNAME=	ns-src-2.29
 PKGNAME=	${DISTNAME:S/-src//}
@@ -12,8 +12,8 @@ COMMENT=	The UCB/LBNL Network Simulator Version 2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILDLINK_DEPENDS.tcl+=	tcl>=8.4.12nb1
-BUILDLINK_DEPENDS.tk+=	tk>=8.4.12nb2
+BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.12nb2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LANGUAGES=	c c++
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index bf2be539a9e..aa1b4e7c22f 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/12/29 06:22:00 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:34 reed Exp $
 
 DISTNAME=	nsd-2.3.3
 CATEGORIES=	net
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.nlnetlabs.nl/nsd/index.html
 COMMENT=	Authoritative-only DNS server
 
 BUILD_DEFS+=	USE_INET6
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 3d00d9c31fe..311b4da76af 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/05 23:10:28 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:22:34 reed Exp $
 
 DISTNAME=	ntop-3.2
 PKGREVISION=	1
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--with-zlib-root=${BUILDLINK_PREFIX.zlib}
 # ntop-3.x crashes with IPv6
 CONFIGURE_ARGS+=	--disable-ipv6
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.3
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk
index eb6666c039f..68493125c4b 100644
--- a/net/openh323/buildlink3.mk
+++ b/net/openh323/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENH323_BUILDLINK3_MK:=	${OPENH323_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenh323}
 BUILDLINK_PACKAGES+=	openh323
 
 .if !empty(OPENH323_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openh323+=	openh323>=1.15.1
-BUILDLINK_RECOMMENDED.openh323+=	openh323>=1.15.2nb1
+BUILDLINK_API_DEPENDS.openh323+=	openh323>=1.15.1
+BUILDLINK_ABI_DEPENDS.openh323+=	openh323>=1.15.2nb1
 BUILDLINK_PKGSRCDIR.openh323?=	../../net/openh323
 .endif	# OPENH323_BUILDLINK3_MK
 
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index c00c64589ae..bc8c6a314f0 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/05/26 20:14:21 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSLP_BUILDLINK3_MK:=	${OPENSLP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenslp}
 BUILDLINK_PACKAGES+=	openslp
 
 .if !empty(OPENSLP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openslp+=	openslp>=1.0.1
-BUILDLINK_RECOMMENDED.openslp+=	openslp>=1.2.1
+BUILDLINK_API_DEPENDS.openslp+=	openslp>=1.0.1
+BUILDLINK_ABI_DEPENDS.openslp+=	openslp>=1.2.1
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
 
diff --git a/net/p5-Net-Packet/Makefile b/net/p5-Net-Packet/Makefile
index ed1d91986f0..8c35972ccad 100644
--- a/net/p5-Net-Packet/Makefile
+++ b/net/p5-Net-Packet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/05 19:37:54 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:34 reed Exp $
 
 DISTNAME=	Net-Packet-2.04
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Net-IPv6Addr-[0-9]*:../../net/p5-Net-IPv6Addr
 DEPENDS+=	p5-Class-Gomor-Hash-[0-9]*:../../devel/p5-Class-Gomor-Hash
 
 PKG_INSTALLATION_TYPES=		overwrite pkgviews
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.9.3nb2
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9.3nb2
 
 PERL5_PACKLIST=		auto/Net/Packet/.packlist
 
diff --git a/net/p5-Net-Pcap/Makefile b/net/p5-Net-Pcap/Makefile
index bd40a58b935..18b1910f933 100644
--- a/net/p5-Net-Pcap/Makefile
+++ b/net/p5-Net-Pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/01/26 02:00:16 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:22:34 reed Exp $
 #
 
 DISTNAME=	Net-Pcap-0.11
@@ -10,7 +10,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Net-Pcap/
 COMMENT=	Perl interface to pcap(3) LBL packet capture library
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.1
 
 PERL5_PACKLIST=	auto/Net/Pcap/.packlist
 
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index effa4f0c255..50198d5f891 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:34 reed Exp $
 #
 
 DISTNAME=	pyorbit-2.0.1
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
-BUILDLINK_DEPENDS.python22+=	python22>=2.2.2nb2
+BUILDLINK_API_DEPENDS.python22+=	python22>=2.2.2nb2
 
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/net/py-ORBit/buildlink3.mk b/net/py-ORBit/buildlink3.mk
index 56fe3578c46..92aeb5cfa07 100644
--- a/net/py-ORBit/buildlink3.mk
+++ b/net/py-ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_ORBIT_BUILDLINK3_MK:=	${PY_ORBIT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyorbit}
 BUILDLINK_PACKAGES+=	pyorbit
 
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
-BUILDLINK_RECOMMENDED.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
+BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_ABI_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
 .endif	# PY_ORBIT_BUILDLINK3_MK
 
diff --git a/net/py-libdnet/buildlink3.mk b/net/py-libdnet/buildlink3.mk
index 43031fbc7df..163ad3036dc 100644
--- a/net/py-libdnet/buildlink3.mk
+++ b/net/py-libdnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYLIBDNET_BUILDLINK3_MK:=	${PYLIBDNET_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+=	pylibdnet
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pylibdnet+=	${PYPKGPREFIX}-libdnet>=1.7
-BUILDLINK_RECOMMENDED.pylibdnet?=	${PYPKGPREFIX}-libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.pylibdnet+=	${PYPKGPREFIX}-libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.pylibdnet?=	${PYPKGPREFIX}-libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.pylibdnet?=	../../net/py-libdnet
 .endif	# PYLIBDNET_BUILDLINK3_MK
 
diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile
index 8a7889733c6..7921c9dd63b 100644
--- a/net/py-libpcap/Makefile
+++ b/net/py-libpcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/04/06 06:22:34 reed Exp $
 #
 
 DISTNAME=		pylibpcap-0.5.1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://pylibpcap.sourceforge.net/
 COMMENT=		Python wrapper for libpcap
 
 PYDISTUTILSPKG=		yes
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.9.3nb1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9.3nb1
 
 pre-build:
 	(cd ${WRKSRC} && ${PYTHONBIN} mk-constants.py)
diff --git a/net/py-libpcap/buildlink3.mk b/net/py-libpcap/buildlink3.mk
index 25d7893915e..4a9b9eccbd5 100644
--- a/net/py-libpcap/buildlink3.mk
+++ b/net/py-libpcap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PYLIBPCAP_BUILDLINK3_MK:=	${PYLIBPCAP_BUILDLINK3_MK}+
@@ -14,8 +14,8 @@ BUILDLINK_PACKAGES+=	pylibpcap
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pylibpcap+=	${PYPKGPREFIX}-libpcap>=0.5.0
-BUILDLINK_RECOMMENDED.pylibpcap?=	${PYPKGPREFIX}-libpcap>=0.5nb1
+BUILDLINK_API_DEPENDS.pylibpcap+=	${PYPKGPREFIX}-libpcap>=0.5.0
+BUILDLINK_ABI_DEPENDS.pylibpcap?=	${PYPKGPREFIX}-libpcap>=0.5nb1
 BUILDLINK_PKGSRCDIR.pylibpcap?=	../../net/py-libpcap
 
 .endif	# PYLIBPCAP_BUILDLINK3_MK
diff --git a/net/py-soappy/buildlink3.mk b/net/py-soappy/buildlink3.mk
index 9e819b72cee..31c43e4bca2 100644
--- a/net/py-soappy/buildlink3.mk
+++ b/net/py-soappy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_SOAPPY_BUILDLINK3_MK:=	${PY_SOAPPY_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-SOAPpy}
 BUILDLINK_PACKAGES+=	py-SOAPpy
 
 .if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
-BUILDLINK_RECOMMENDED.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
+BUILDLINK_API_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
+BUILDLINK_ABI_DEPENDS.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
 BUILDLINK_PKGSRCDIR.py-SOAPpy?=	../../net/py-soappy
 .endif	# PY_SOAPPY_BUILDLINK3_MK
 
diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk
index 00378e73e1c..616e01df85c 100644
--- a/net/samba/buildlink3.mk
+++ b/net/samba/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/14 17:18:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SAMBA_BUILDLINK3_MK:=	${SAMBA_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsamba}
 BUILDLINK_PACKAGES+=	samba
 
 .if !empty(SAMBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.samba+=	samba>=3.0.7
+BUILDLINK_API_DEPENDS.samba+=	samba>=3.0.7
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba
 .endif	# SAMBA_BUILDLINK3_MK
 
diff --git a/net/scdp/Makefile b/net/scdp/Makefile
index 111fa430a55..c8a02ca5404 100644
--- a/net/scdp/Makefile
+++ b/net/scdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:34 reed Exp $
 #
 
 DISTNAME=	scdp-1.0b
@@ -13,7 +13,7 @@ COMMENT=	Program to send Cisco Discovery Protocol packets
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/scli/Makefile b/net/scli/Makefile
index f4a8e16ba76..ef74ce99bf3 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 03:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:34 reed Exp $
 #
 
 DISTNAME=		scli-0.2.12
@@ -13,7 +13,7 @@ COMMENT=		SNMP command line interface
 GNU_CONFIGURE=		yes
 
 USE_GNU_READLINE=	# history_list
-BUILDLINK_DEPENDS.readline+=    readline>=4.0
+BUILDLINK_API_DEPENDS.readline+=    readline>=4.0
 
 INFO_FILES=		# PLIST
 
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index e83b6e5c4d9..231617d50b4 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS4_BUILDLINK3_MK:=	${SOCKS4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks4}
 BUILDLINK_PACKAGES+=	socks4
 
 .if !empty(SOCKS4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks4+=	socks4>=2.2
+BUILDLINK_API_DEPENDS.socks4+=	socks4>=2.2
 BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 BUILDLINK_TRANSFORM+=	l:socks:socks4
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index 8a9980928c1..15f29662c4d 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOCKS5_BUILDLINK3_MK:=	${SOCKS5_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsocks5}
 BUILDLINK_PACKAGES+=	socks5
 
 .if !empty(SOCKS5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks5+=	socks5>=1.0.2
+BUILDLINK_API_DEPENDS.socks5+=	socks5>=1.0.2
 BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 .endif	# SOCKS5_BUILDLINK3_MK
 
diff --git a/net/soup/buildlink3.mk b/net/soup/buildlink3.mk
index 7eaef201fa4..3fbaf6c4cbb 100644
--- a/net/soup/buildlink3.mk
+++ b/net/soup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOUP_BUILDLINK3_MK:=	${SOUP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsoup}
 BUILDLINK_PACKAGES+=	soup
 
 .if !empty(SOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.soup?=                soup>=0.7.11nb3
-BUILDLINK_RECOMMENDED.soup?=	soup>=0.7.11nb5
+BUILDLINK_API_DEPENDS.soup?=                soup>=0.7.11nb3
+BUILDLINK_ABI_DEPENDS.soup?=	soup>=0.7.11nb5
 BUILDLINK_PKGSRCDIR.soup?=	../../net/soup
 .endif	# SOUP_BUILDLINK3_MK
 
diff --git a/net/spread/buildlink3.mk b/net/spread/buildlink3.mk
index 135749cf18b..88b5adef683 100644
--- a/net/spread/buildlink3.mk
+++ b/net/spread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/05 19:25:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:35 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPREAD_BUILDLINK3_MK:=	${SPREAD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspread}
 BUILDLINK_PACKAGES+=	spread
 
 .if !empty(SPREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.spread+=	spread>=3.17.1
+BUILDLINK_API_DEPENDS.spread+=	spread>=3.17.1
 BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
 .endif	# SPREAD_BUILDLINK3_MK
 
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index 7f2334389e9..97102e2c975 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:00 tv Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:35 reed Exp $
 #
 
 DISTNAME=	scotty-${DIST_VERS}
@@ -11,7 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://wwwhome.cs.utwente.nl/~schoenw/scotty/
 COMMENT=	Network management extensions to TCL
 
-BUILDLINK_DEPENDS.tcl+=	tcl>=8.4.6nb4
+BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.6nb4
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk
index ba37195232c..94e77847404 100644
--- a/net/tcl-scotty/buildlink3.mk
+++ b/net/tcl-scotty/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:00 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_SCOTTY_BUILDLINK3_MK:=	${TCL_SCOTTY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-scotty}
 BUILDLINK_PACKAGES+=	tcl-scotty
 
 .if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
-BUILDLINK_RECOMMENDED.tcl-scotty+=	tcl-scotty>=2.1.11nb4
+BUILDLINK_API_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
+BUILDLINK_ABI_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11nb4
 BUILDLINK_PKGSRCDIR.tcl-scotty?=	../../net/tcl-scotty
 .endif	# TCL_SCOTTY_BUILDLINK3_MK
 
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index 5f43675732e..b389b4f3f6a 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:35 reed Exp $
 
 DISTNAME=		tcpdump-3.9.4
 CATEGORIES=		net
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		YES
 .include "options.mk"
 
 # not strictly needed
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 0ba4bc946b1..7431165d85c 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:35 reed Exp $
 
 DISTNAME=	tcpreplay-2.3.5
 CATEGORIES=	net
@@ -8,7 +8,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcpreplay.sourceforge.net/
 COMMENT=	Replay saved tcpdump or snoop files
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
 
 GNU_CONFIGURE=	yes
 
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 6b59ec7fcb5..1edfec9ad97 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:35 reed Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -11,7 +11,7 @@ HOMEPAGE=		http://michael.toren.net/code/tcptraceroute/
 COMMENT=		Traceroute implementation using TCP packets
 
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 BUILD_TARGET=		tcptraceroute
 
diff --git a/net/tor/Makefile b/net/tor/Makefile
index 2357decf8f8..6e9aaa686b3 100644
--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:35 reed Exp $
 #
 
 DISTNAME=		tor-0.1.0.17
@@ -60,7 +60,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
 
-BUILDLINK_DEPENDS.libevent+= libevent>=1.1a
+BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
 # XXX the pkgsrc libevent builtin.mk does not detect the version of a builtin
 # libevent, so we need to force use of the pkgsrc one
 USE_BUILTIN.libevent=	no
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 183aadb9344..2097c875f9b 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:35 reed Exp $
 
 DISTNAME=	trafshow-5.2.1
 PKGREVISION=	1
@@ -29,7 +29,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.trafshow \
 		${PREFIX}/share/examples/trafshow/trafshow
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.7
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.7
 .include "../../net/libpcap/buildlink3.mk"
 
 .include "../../mk/curses.buildlink3.mk"
diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile
index 08707bc4896..64c46654109 100644
--- a/net/ucarp/Makefile
+++ b/net/ucarp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:35 reed Exp $
 #
 
 DISTNAME=		ucarp-1.1
@@ -15,7 +15,7 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 # pcap_freecode with one argument only
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6.0
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6.0
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucarp
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 95b9afd609d..6a8052e4f52 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:35 reed Exp $
 
 DISTNAME=	unison-2.17.1
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	File-synchronization tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 50ca3b27933..f5e3ac42c68 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:22:35 reed Exp $
 
 DISTNAME=	unison-2.13.16
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	File-synchronization tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
diff --git a/net/whoson/buildlink3.mk b/net/whoson/buildlink3.mk
index 9b2a9a7a1b1..b49ce9e0aca 100644
--- a/net/whoson/buildlink3.mk
+++ b/net/whoson/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 16:51:54 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:35 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WHOSON_BUILDLINK3_MK:=	${WHOSON_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwhoson}
 BUILDLINK_PACKAGES+=	whoson
 
 .if !empty(WHOSON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.whoson+=	whoson>=2.03
+BUILDLINK_API_DEPENDS.whoson+=	whoson>=2.03
 BUILDLINK_PKGSRCDIR.whoson?=	../../net/whoson
 .endif	# WHOSON_BUILDLINK3_MK
 
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 2af9a96a09c..f7090c46009 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:35 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
 BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
 
 .if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
-BUILDLINK_RECOMMENDED.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.4.1nb3
+BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.4.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
 .endif	# XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
 
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index d2bf56221ff..6db13c70ea4 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:35 reed Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -11,7 +11,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump
 COMMENT=	Displays IP packets using X Window System
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
diff --git a/net/yaz/buildlink3.mk b/net/yaz/buildlink3.mk
index f312a262c8e..b6d276503de 100644
--- a/net/yaz/buildlink3.mk
+++ b/net/yaz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:35 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 YAZ_BUILDLINK3_MK:=	${YAZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nyaz}
 BUILDLINK_PACKAGES+=	yaz
 
 .if !empty(YAZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.yaz+=	yaz>=2.0
-BUILDLINK_RECOMMENDED.yaz+=	yaz>=2.1.6nb1
+BUILDLINK_API_DEPENDS.yaz+=	yaz>=2.0
+BUILDLINK_ABI_DEPENDS.yaz+=	yaz>=2.1.6nb1
 BUILDLINK_PKGSRCDIR.yaz?=	../../net/yaz
 .endif	# YAZ_BUILDLINK3_MK