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

69 files changed, 193 insertions, 193 deletions

diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index 749798019b8..38b507dd825 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:33 reed Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
@@ -20,7 +20,7 @@ do-install:
 	cd ${WRKSRC}/src/audio/nas && ${SHLIBTOOL} --mode=install \
 		${INSTALL_DATA} libaudio_nas.la ${PREFIX}/lib
 
-BUILDLINK_DEPENDS.SDL+=	SDL>=1.2.5nb6
+BUILDLINK_API_DEPENDS.SDL+=	SDL>=1.2.5nb6
 
 .include "../../audio/nas/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index b088073022f..a5a868e7c0b 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_mixer}
 BUILDLINK_PACKAGES+=	SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
-BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.6nb4
+BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6nb4
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 .endif	# SDL_MIXER_BUILDLINK3_MK
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index 3db4ff7d74d..af628c30e32 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_SOUND_BUILDLINK3_MK:=	${SDL_SOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDL_sound}
 BUILDLINK_PACKAGES+=	SDL_sound
 
 .if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
-BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb4
+BUILDLINK_API_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
+BUILDLINK_ABI_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1nb4
 BUILDLINK_PKGSRCDIR.SDL_sound?=	../../audio/SDL_sound
 .endif	# SDL_SOUND_BUILDLINK3_MK
 
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index ce96d06d7e0..11438c8f026 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/04 20:13:55 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:21:33 reed Exp $
 
 DISTNAME=		amarok-1.3.9
 CATEGORIES=		audio kde
@@ -22,9 +22,9 @@ CONFIGURE_ARGS+=	--without-arts	# disable aRts engine
 
 LIBS+=			${LIBOSSAUDIO}
 
-BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.3.0
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.3.0
-BUILDLINK_DEPENDS.taglib+=	taglib>=1.4
+BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.3.0
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.3.0
+BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.4
 
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 5084efbc84f..71f2861699f 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/03/09 21:04:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Narts}
 BUILDLINK_PACKAGES+=	arts
 
 .if !empty(ARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.arts+=	arts>=1.1.4nb1
-BUILDLINK_RECOMMENDED.arts+=	arts>=1.5.1nb1
+BUILDLINK_API_DEPENDS.arts+=	arts>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.arts+=	arts>=1.5.1nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 9a0fc803103..49ce09284eb 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BMP_BUILDLINK3_MK:=	${BMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbmp}
 BUILDLINK_PACKAGES+=	bmp
 
 .if !empty(BMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
-BUILDLINK_RECOMMENDED.bmp?=	bmp>=0.9.7nb4
+BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
+BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7nb4
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Input$$/ \
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index 86e2d15d39e..1fa509462e1 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDDB_BUNDLE_BUILDLINK3_MK:=	${CDDB_BUNDLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncddb-bundle}
 BUILDLINK_PACKAGES+=	cddb-bundle
 
 .if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
-BUILDLINK_RECOMMENDED.cddb-bundle?=	cddb-bundle>=0.2nb1
+BUILDLINK_API_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
+BUILDLINK_ABI_DEPENDS.cddb-bundle?=	cddb-bundle>=0.2nb1
 BUILDLINK_PKGSRCDIR.cddb-bundle?=	../../audio/cddb-bundle
 .endif	# CDDB_BUNDLE_BUILDLINK3_MK
 
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index 0771fe4598b..de37ea99fcc 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/07 06:30:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPARANOIA_BUILDLINK3_MK:=	${CDPARANOIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdparanoia}
 BUILDLINK_PACKAGES+=	cdparanoia
 
 .if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdparanoia+=		cdparanoia>=3.0
-BUILDLINK_RECOMMENDED.cdparanoia?=	cdparanoia>=3.0.9.8nb5
+BUILDLINK_API_DEPENDS.cdparanoia+=		cdparanoia>=3.0
+BUILDLINK_ABI_DEPENDS.cdparanoia?=	cdparanoia>=3.0.9.8nb5
 BUILDLINK_PKGSRCDIR.cdparanoia?=	../../audio/cdparanoia
 .endif	# CDPARANOIA_BUILDLINK3_MK
 
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
index f8bdb1f660f..4f2888a9fd6 100644
--- a/audio/cdplayer/buildlink3.mk
+++ b/audio/cdplayer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPLAYER_BUILDLINK3_MK:=	${CDPLAYER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdplayer}
 BUILDLINK_PACKAGES+=	cdplayer
 
 .if !empty(CDPLAYER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdplayer+=	cdplayer>=0.4.2
-BUILDLINK_RECOMMENDED.cdplayer?=	cdplayer>=0.4.2nb3
+BUILDLINK_API_DEPENDS.cdplayer+=	cdplayer>=0.4.2
+BUILDLINK_ABI_DEPENDS.cdplayer?=	cdplayer>=0.4.2nb3
 BUILDLINK_PKGSRCDIR.cdplayer?=	../../audio/cdplayer
 .endif	# CDPLAYER_BUILDLINK3_MK
 
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index f0c13f46e43..726d8851d47 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nesound}
 BUILDLINK_PACKAGES+=	esound
 
 .if !empty(ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.esound+=	esound>=0.2.18
-BUILDLINK_RECOMMENDED.esound+=	esound>=0.2.35nb1
+BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.18
+BUILDLINK_ABI_DEPENDS.esound+=	esound>=0.2.35nb1
 BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 .endif	# ESOUND_BUILDLINK3_MK
 
diff --git a/audio/faac/buildlink3.mk b/audio/faac/buildlink3.mk
index 2eabf833558..b1f81189e28 100644
--- a/audio/faac/buildlink3.mk
+++ b/audio/faac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAC_BUILDLINK3_MK:=	${FAAC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaac}
 BUILDLINK_PACKAGES+=	faac
 
 .if !empty(FAAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faac+=	faac>=1.24
-BUILDLINK_RECOMMENDED.faac+=	faac>=1.24nb1
+BUILDLINK_API_DEPENDS.faac+=	faac>=1.24
+BUILDLINK_ABI_DEPENDS.faac+=	faac>=1.24nb1
 BUILDLINK_PKGSRCDIR.faac?=	../../audio/faac
 .endif	# FAAC_BUILDLINK3_MK
 
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 2203fa0fbbd..484e80c3b94 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:06 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAD2_BUILDLINK3_MK:=	${FAAD2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaad2}
 BUILDLINK_PACKAGES+=	faad2
 
 .if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faad2+=	faad2>=2.0nb3
-BUILDLINK_RECOMMENDED.faad2?=	faad2>=2.0nb5
+BUILDLINK_API_DEPENDS.faad2+=	faad2>=2.0nb3
+BUILDLINK_ABI_DEPENDS.faad2?=	faad2>=2.0nb5
 BUILDLINK_PKGSRCDIR.faad2?=	../../audio/faad2
 BUILDLINK_INCDIRS.faad2?=	include/faad2
 .endif	# FAAD2_BUILDLINK3_MK
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index 8ab51408864..b8f6e67757e 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLAC_BUILDLINK3_MK:=	${FLAC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nflac}
 BUILDLINK_PACKAGES+=	flac
 
 .if !empty(FLAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flac+=	flac>=1.1.0nb1
-BUILDLINK_RECOMMENDED.flac+=	flac>=1.1.2nb1
+BUILDLINK_API_DEPENDS.flac+=	flac>=1.1.0nb1
+BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
 .endif	# FLAC_BUILDLINK3_MK
 
diff --git a/audio/fluidsynth/buildlink3.mk b/audio/fluidsynth/buildlink3.mk
index e2620861f3b..f693cc35f9d 100644
--- a/audio/fluidsynth/buildlink3.mk
+++ b/audio/fluidsynth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/19 18:26:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FLUIDSYNTH_BUILDLINK3_MK:=	${FLUIDSYNTH_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfluidsynth}
 BUILDLINK_PACKAGES+=	fluidsynth
 
 .if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
+BUILDLINK_API_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
 BUILDLINK_PKGSRCDIR.fluidsynth?=	../../audio/fluidsynth
 .endif	# FLUIDSYNTH_BUILDLINK3_MK
 
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 50427d01f40..deecd3f2ad7 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/28 16:24:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/04/06 06:21:34 reed Exp $
 #
 
 DISTNAME=	gkrellmms-2.1.20
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake pkg-config
 USE_PKGLOCALEDIR=	YES
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm>=2.2.0
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.2.0
 
 WRKSRC=		${WRKDIR}/gkrellmms
 MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index a79794127cb..f7c12dd495d 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPEECH_BUILDLINK3_MK:=	${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-speech}
 BUILDLINK_PACKAGES+=	gnome-speech
 
 .if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
-BUILDLINK_RECOMMENDED.gnome-speech+=	gnome-speech>=0.3.9nb2
+BUILDLINK_API_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
+BUILDLINK_ABI_DEPENDS.gnome-speech+=	gnome-speech>=0.3.9nb2
 BUILDLINK_PKGSRCDIR.gnome-speech?=	../../audio/gnome-speech
 .endif	# GNOME_SPEECH_BUILDLINK3_MK
 
diff --git a/audio/goom/buildlink3.mk b/audio/goom/buildlink3.mk
index d243cdfa53d..ac5bdc05f56 100644
--- a/audio/goom/buildlink3.mk
+++ b/audio/goom/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/02/20 14:59:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOOM_BUILDLINK3_MK:=	${GOOM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoom}
 BUILDLINK_PACKAGES+=	goom
 
 .if !empty(GOOM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goom+=	goom>=2004.0
+BUILDLINK_API_DEPENDS.goom+=	goom>=2004.0
 BUILDLINK_PKGSRCDIR.goom?=	../../audio/goom
 .endif	# GOOM_BUILDLINK3_MK
 
diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk
index 0ff04e76312..035a75f934f 100644
--- a/audio/gsm/buildlink3.mk
+++ b/audio/gsm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GSM_BUILDLINK3_MK:=	${GSM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngsm}
 BUILDLINK_PACKAGES+=	gsm
 
 .if !empty(GSM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsm+=		gsm>=1.0.10
-BUILDLINK_RECOMMENDED.gsm+=	gsm>=1.0.10nb1
+BUILDLINK_API_DEPENDS.gsm+=		gsm>=1.0.10
+BUILDLINK_ABI_DEPENDS.gsm+=	gsm>=1.0.10nb1
 BUILDLINK_PKGSRCDIR.gsm?=	../../audio/gsm
 .endif	# GSM_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-artsd/buildlink3.mk b/audio/gst-plugins0.8-artsd/buildlink3.mk
index 26e9b7f71d5..a8f26fd11cd 100644
--- a/audio/gst-plugins0.8-artsd/buildlink3.mk
+++ b/audio/gst-plugins0.8-artsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-artsd}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-artsd
 
 .if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-artsd?=	../../audio/gst-plugins0.8-artsd
 .endif	# GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-esound/buildlink3.mk b/audio/gst-plugins0.8-esound/buildlink3.mk
index e4e08cd65e5..b2276051efc 100644
--- a/audio/gst-plugins0.8-esound/buildlink3.mk
+++ b/audio/gst-plugins0.8-esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-esound}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-esound
 
 .if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-esound?=	../../audio/gst-plugins0.8-esound
 .endif	# GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-mad/buildlink3.mk b/audio/gst-plugins0.8-mad/buildlink3.mk
index 4c4199eceb3..2de671f0d15 100644
--- a/audio/gst-plugins0.8-mad/buildlink3.mk
+++ b/audio/gst-plugins0.8-mad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_MAD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_MAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8-mad}
 BUILDLINK_PACKAGES+=	gst-plugins0.8-mad
 
 .if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-mad?=	../../audio/gst-plugins0.8-mad
 .endif	# GST_PLUGINS0.8_MAD_BUILDLINK3_MK
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 77c4dc58965..c2d5c4fb071 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/25 14:25:01 smb Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/06 06:21:34 reed Exp $
 #
 
 DISTNAME=	gtkpod-0.94.0
@@ -20,7 +20,7 @@ USE_TOOLS+=	pkg-config perl:run
 
 REPLACE_PERL+=		scripts/mab2vcard
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.4.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 
 .include "options.mk"
 
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 0cf2c92266e..1fff0ff57ea 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ID3LIB_BUILDLINK3_MK:=	${ID3LIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nid3lib}
 BUILDLINK_PACKAGES+=	id3lib
 
 .if !empty(ID3LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.id3lib+=	id3lib>=3.8.3
-BUILDLINK_RECOMMENDED.id3lib+=	id3lib>=3.8.3nb1
+BUILDLINK_API_DEPENDS.id3lib+=	id3lib>=3.8.3
+BUILDLINK_ABI_DEPENDS.id3lib+=	id3lib>=3.8.3nb1
 BUILDLINK_PKGSRCDIR.id3lib?=	../../audio/id3lib
 .endif	# ID3LIB_BUILDLINK3_MK
 
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
index b562f545e2e..500e682ced2 100644
--- a/audio/ladspa/buildlink3.mk
+++ b/audio/ladspa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 #
 # This Makefile fragment is included by packages that use ladspa.
 #
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+=	ladspa
 
 .if !empty(LADSPA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			ladspa
-BUILDLINK_DEPENDS.ladspa+=		ladspa>=1.12
-BUILDLINK_RECOMMENDED.ladspa?=		ladspa>=1.12nb1
+BUILDLINK_API_DEPENDS.ladspa+=		ladspa>=1.12
+BUILDLINK_ABI_DEPENDS.ladspa?=		ladspa>=1.12nb1
 BUILDLINK_PKGSRCDIR.ladspa?=		../../audio/ladspa
 
 .endif # LADSPA_BUILDLINK3_MK
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index 6bb25ee0294..9c7e0a1ef80 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LAME_BUILDLINK3_MK:=	${LAME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlame}
 BUILDLINK_PACKAGES+=	lame
 
 .if !empty(LAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lame+=	lame>=3.93.1nb2
-BUILDLINK_RECOMMENDED.lame+=	lame>=3.96.1nb4
+BUILDLINK_API_DEPENDS.lame+=	lame>=3.93.1nb2
+BUILDLINK_ABI_DEPENDS.lame+=	lame>=3.96.1nb4
 BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
 .endif	# LAME_BUILDLINK3_MK
 
diff --git a/audio/liba52/buildlink3.mk b/audio/liba52/buildlink3.mk
index 94b336a1a9b..547c93a215e 100644
--- a/audio/liba52/buildlink3.mk
+++ b/audio/liba52/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBA52_BUILDLINK3_MK:=	${LIBA52_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliba52}
 BUILDLINK_PACKAGES+=	liba52
 
 .if !empty(LIBA52_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liba52+=	liba52>=0.7.4
-BUILDLINK_RECOMMENDED.liba52+=	liba52>=0.7.4nb3
+BUILDLINK_API_DEPENDS.liba52+=	liba52>=0.7.4
+BUILDLINK_ABI_DEPENDS.liba52+=	liba52>=0.7.4nb3
 BUILDLINK_PKGSRCDIR.liba52?=	../../audio/liba52
 .endif	# LIBA52_BUILDLINK3_MK
 
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile
index db4fdb2219c..8405b44b0dc 100644
--- a/audio/libao-macosx/Makefile
+++ b/audio/libao-macosx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/06 06:21:34 reed Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -13,7 +13,7 @@ CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
 BUILD_DIRS=		${WRKSRC}/src/plugins/macosx
 INSTALL_DIRS=		${WRKSRC}/src/plugins/macosx
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
index 8cb9f7f4d36..d969cb859a9 100644
--- a/audio/libao-oss/Makefile
+++ b/audio/libao-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:35 reed Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -20,7 +20,7 @@ SUBST_FILES.oss=	src/plugins/oss/ao_oss.c
 SUBST_SED.oss=		-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
 SUBST_SED.oss+=		-e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
diff --git a/audio/libao-sun/Makefile b/audio/libao-sun/Makefile
index 53a49387377..70d76a12f15 100644
--- a/audio/libao-sun/Makefile
+++ b/audio/libao-sun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:21:35 reed Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -13,7 +13,7 @@ CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
 BUILD_DIRS=		${WRKSRC}/src/plugins/sun
 INSTALL_DIRS=		${WRKSRC}/src/plugins/sun
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index 1d55079e6da..831aa1276ad 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:34 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibao}
 BUILDLINK_PACKAGES+=	libao
 
 .if !empty(LIBAO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.4
-BUILDLINK_RECOMMENDED.libao+=	libao>=0.8.6nb3
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.4
+BUILDLINK_ABI_DEPENDS.libao+=	libao>=0.8.6nb3
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  if !defined(_LIBAO_BUILDING_PLUGIN)
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 04efb44535a..b7b355daa84 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Naudiofile}
 BUILDLINK_PACKAGES+=	audiofile
 
 .if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.audiofile+=	libaudiofile>=0.2.1
-BUILDLINK_RECOMMENDED.audiofile+=	libaudiofile>=0.2.6nb1
+BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.1
+BUILDLINK_ABI_DEPENDS.audiofile+=	libaudiofile>=0.2.6nb1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
 
diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk
index 95b862c3aed..ce395276a3d 100644
--- a/audio/libcdaudio/buildlink3.mk
+++ b/audio/libcdaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/05/16 09:48:30 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCDAUDIO_BUILDLINK3_MK:=	${LIBCDAUDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcdaudio}
 BUILDLINK_PACKAGES+=	libcdaudio
 
 .if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
-BUILDLINK_RECOMMENDED.libcdaudio+=	libcdaudio>=0.99.12nb1
+BUILDLINK_API_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
+BUILDLINK_ABI_DEPENDS.libcdaudio+=	libcdaudio>=0.99.12nb1
 BUILDLINK_PKGSRCDIR.libcdaudio?=	../../audio/libcdaudio
 .endif	# LIBCDAUDIO_BUILDLINK3_MK
 
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index ee0641b6b3b..2b4b7592f6d 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/04/29 19:46:52 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCDDB_BUILDLINK3_MK:=	${LIBCDDB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcddb}
 BUILDLINK_PACKAGES+=	libcddb
 
 .if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcddb+=	libcddb>=0.9.4
-BUILDLINK_RECOMMENDED.libcddb+=	libcddb>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libcddb+=	libcddb>=0.9.4
+BUILDLINK_ABI_DEPENDS.libcddb+=	libcddb>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.libcddb?=	../../audio/libcddb
 .endif	# LIBCDDB_BUILDLINK3_MK
 
diff --git a/audio/libdca/buildlink3.mk b/audio/libdca/buildlink3.mk
index 1a44d0f760b..2cbb939cb41 100644
--- a/audio/libdca/buildlink3.mk
+++ b/audio/libdca/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/12/09 17:21:02 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
 #
 
 BUILDLINK_DEPMETHOD.libdca?=	build
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdca}
 BUILDLINK_PACKAGES+=	libdca
 
 .if !empty(LIBDTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdca+=	libdca>=0.0.2
+BUILDLINK_API_DEPENDS.libdca+=	libdca>=0.0.2
 BUILDLINK_PKGSRCDIR.libdca?=	../../audio/libdca
 .endif	# LIBDTS_BUILDLINK3_MK
 
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
index 0b96d245882..440d709a42e 100644
--- a/audio/libhydrogen/buildlink3.mk
+++ b/audio/libhydrogen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBHYDROGEN_BUILDLINK3_MK:=	${LIBHYDROGEN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibhydrogen}
 BUILDLINK_PACKAGES+=	libhydrogen
 
 .if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
-BUILDLINK_RECOMMENDED.libhydrogen+=	libhydrogen>=0.8.0nb2
+BUILDLINK_API_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
+BUILDLINK_ABI_DEPENDS.libhydrogen+=	libhydrogen>=0.8.0nb2
 BUILDLINK_PKGSRCDIR.libhydrogen?=	../../audio/libhydrogen
 .endif	# LIBHYDROGEN_BUILDLINK3_MK
 
diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk
index 6ab0dc6624f..063de0955dc 100644
--- a/audio/libid3tag/buildlink3.mk
+++ b/audio/libid3tag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBID3TAG_BUILDLINK3_MK:=	${LIBID3TAG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibid3tag}
 BUILDLINK_PACKAGES+=	libid3tag
 
 .if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
-BUILDLINK_RECOMMENDED.libid3tag+=	libid3tag>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libid3tag+=	libid3tag>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libid3tag?=	../../audio/libid3tag
 .endif	# LIBID3TAG_BUILDLINK3_MK
 
diff --git a/audio/libmad/buildlink3.mk b/audio/libmad/buildlink3.mk
index 2849775cf96..9b2158d558a 100644
--- a/audio/libmad/buildlink3.mk
+++ b/audio/libmad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMAD_BUILDLINK3_MK:=		${LIBMAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmad}
 BUILDLINK_PACKAGES+=	libmad
 
 .if !empty(LIBMAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmad+=	libmad>=0.15.0b
-BUILDLINK_RECOMMENDED.libmad+=	libmad>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libmad+=	libmad>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libmad?=	../../audio/libmad
 .endif	# LIBMAD_BUILDLINK3_MK
 
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index 80899b09961..6422f6fe914 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIKMOD_BUILDLINK3_MK:=	${LIBMIKMOD_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmikmod}
 BUILDLINK_PACKAGES+=	libmikmod
 
 .if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmikmod+=	libmikmod>=3.1.9
-BUILDLINK_RECOMMENDED.libmikmod+=	libmikmod>=3.1.11.1nb2
+BUILDLINK_API_DEPENDS.libmikmod+=	libmikmod>=3.1.9
+BUILDLINK_ABI_DEPENDS.libmikmod+=	libmikmod>=3.1.11.1nb2
 BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
 .endif	# LIBMIKMOD_BUILDLINK3_MK
 
diff --git a/audio/libmodplug/buildlink3.mk b/audio/libmodplug/buildlink3.mk
index 95052654a13..1c370a12a8d 100644
--- a/audio/libmodplug/buildlink3.mk
+++ b/audio/libmodplug/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMODPLUG_BUILDLINK3_MK:=	${LIBMODPLUG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmodplug}
 BUILDLINK_PACKAGES+=	libmodplug
 
 .if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmodplug+=		libmodplug>=0.7
-BUILDLINK_RECOMMENDED.libmodplug+=	libmodplug>=0.7nb1
+BUILDLINK_API_DEPENDS.libmodplug+=		libmodplug>=0.7
+BUILDLINK_ABI_DEPENDS.libmodplug+=	libmodplug>=0.7nb1
 BUILDLINK_PKGSRCDIR.libmodplug?=	../../audio/libmodplug
 .endif	# LIBMODPLUG_BUILDLINK3_MK
 
diff --git a/audio/libmpd/buildlink3.mk b/audio/libmpd/buildlink3.mk
index 2cbaa35e385..bf0fdf46406 100644
--- a/audio/libmpd/buildlink3.mk
+++ b/audio/libmpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/22 19:26:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMPD_BUILDLINK3_MK:=	${LIBMPD_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpd}
 BUILDLINK_PACKAGES+=	libmpd
 
 .if !empty(LIBMPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpd+=	libmpd>=0.01
+BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.01
 BUILDLINK_PKGSRCDIR.libmpd?=	../../audio/libmpd
 .endif	# LIBMPD_BUILDLINK3_MK
 
diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk
index 559dc42b9f8..548bc0b0e45 100644
--- a/audio/libmusepack/buildlink3.mk
+++ b/audio/libmusepack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/04 20:28:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMUSEPACK_BUILDLINK3_MK:=	${LIBMUSEPACK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmusepack}
 BUILDLINK_PACKAGES+=	libmusepack
 
 .if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmusepack+=		libmusepack>=1.0.3
+BUILDLINK_API_DEPENDS.libmusepack+=		libmusepack>=1.0.3
 BUILDLINK_PKGSRCDIR.libmusepack?=	../../audio/libmusepack
 .endif	# LIBMUSEPACK_BUILDLINK3_MK
 
diff --git a/audio/libopendaap/buildlink3.mk b/audio/libopendaap/buildlink3.mk
index d2aa13bdde5..aae1f11f4db 100644
--- a/audio/libopendaap/buildlink3.mk
+++ b/audio/libopendaap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/19 15:36:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBOPENDAAP_BUILDLINK3_MK:=	${LIBOPENDAAP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibopendaap}
 BUILDLINK_PACKAGES+=	libopendaap
 
 .if !empty(LIBOPENDAAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.2.1
-BUILDLINK_RECOMMENDED.libopendaap+=	libopendaap>=0.2.1nb1
+BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.2.1
+BUILDLINK_ABI_DEPENDS.libopendaap+=	libopendaap>=0.2.1nb1
 BUILDLINK_PKGSRCDIR.libopendaap?=	../../audio/libopendaap
 .endif	# LIBOPENDAAP_BUILDLINK3_MK
 
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 9fe98307f44..8d6bdae7c56 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:21:35 reed Exp $
 #
 
 DISTNAME=	libsamplerate-0.1.2
@@ -16,7 +16,7 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/samplerate.pc.in
 
 TEST_TARGET=	check
 
-BUILDLINK_DEPENDS.libsndfile+=	libsndfile>=1.0.2
+BUILDLINK_API_DEPENDS.libsndfile+=	libsndfile>=1.0.2
 
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index a2e703d6ae4..c06c33b3972 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSAMPLERATE_BUILDLINK3_MK:=	${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsamplerate}
 BUILDLINK_PACKAGES+=	libsamplerate
 
 .if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
-BUILDLINK_RECOMMENDED.libsamplerate+=	libsamplerate>=0.1.2nb2
+BUILDLINK_API_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
+BUILDLINK_ABI_DEPENDS.libsamplerate+=	libsamplerate>=0.1.2nb2
 BUILDLINK_PKGSRCDIR.libsamplerate?=	../../audio/libsamplerate
 .endif	# LIBSAMPLERATE_BUILDLINK3_MK
 
diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk
index dfaf29a6ac1..fd30b15e921 100644
--- a/audio/libshout/buildlink3.mk
+++ b/audio/libshout/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/02/28 02:21:20 kim Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:35 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSHOUT_BUILDLINK3_MK:=	${LIBSHOUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibshout}
 BUILDLINK_PACKAGES+=	libshout
 
 .if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libshout+=	libshout>=2.0
-BUILDLINK_RECOMMENDED.libshout+=libshout>=2.0nb1
+BUILDLINK_API_DEPENDS.libshout+=	libshout>=2.0
+BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1
 BUILDLINK_PKGSRCDIR.libshout?=	../../audio/libshout
 .endif	# LIBSHOUT_BUILDLINK3_MK
 
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index b503f92a015..71f41581cbb 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIDPLAY_BUILDLINK3_MK:=	${LIBSIDPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsidplay}
 BUILDLINK_PACKAGES+=	libsidplay
 
 .if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsidplay+=		libsidplay>=1.36.38
-BUILDLINK_RECOMMENDED.libsidplay+=	libsidplay>=1.36.59nb2
+BUILDLINK_API_DEPENDS.libsidplay+=		libsidplay>=1.36.38
+BUILDLINK_ABI_DEPENDS.libsidplay+=	libsidplay>=1.36.59nb2
 BUILDLINK_PKGSRCDIR.libsidplay?=	../../audio/libsidplay
 .endif	# LIBSIDPLAY_BUILDLINK3_MK
 
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index c3dfb1fe4f2..4cc67e6eaf3 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSNDFILE_BUILDLINK3_MK:=	${LIBSNDFILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibsndfile}
 BUILDLINK_PACKAGES+=	libsndfile
 
 .if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsndfile+=		libsndfile>=1.0.0
-BUILDLINK_RECOMMENDED.libsndfile+=	libsndfile>=1.0.13nb1
+BUILDLINK_API_DEPENDS.libsndfile+=		libsndfile>=1.0.0
+BUILDLINK_ABI_DEPENDS.libsndfile+=	libsndfile>=1.0.13nb1
 BUILDLINK_PKGSRCDIR.libsndfile?=	../../audio/libsndfile
 .endif	# LIBSNDFILE_BUILDLINK3_MK
 
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
index 017e398f094..c45349b6565 100644
--- a/audio/libvisual/buildlink3.mk
+++ b/audio/libvisual/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVISUAL_BUILDLINK3_MK:=	${LIBVISUAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvisual}
 BUILDLINK_PACKAGES+=	libvisual
 
 .if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvisual+=	libvisual>=0.2.0
-BUILDLINK_RECOMMENDED.libvisual?=	libvisual>=0.2.0nb1
+BUILDLINK_API_DEPENDS.libvisual+=	libvisual>=0.2.0
+BUILDLINK_ABI_DEPENDS.libvisual?=	libvisual>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.libvisual?=	../../audio/libvisual
 .endif	# LIBVISUAL_BUILDLINK3_MK
 
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index a71838229a3..c7aeafc2ced 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVORBIS_BUILDLINK3_MK:=	${LIBVORBIS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibvorbis}
 BUILDLINK_PACKAGES+=	libvorbis
 
 .if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvorbis+=	libvorbis>=1.0.1
-BUILDLINK_RECOMMENDED.libvorbis+=	libvorbis>=1.1.0nb1
+BUILDLINK_API_DEPENDS.libvorbis+=	libvorbis>=1.0.1
+BUILDLINK_ABI_DEPENDS.libvorbis+=	libvorbis>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
 .endif	# LIBVORBIS_BUILDLINK3_MK
 
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 090753e67d9..f49d9a00391 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmusicbrainz}
 BUILDLINK_PACKAGES+=	musicbrainz
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
-BUILDLINK_RECOMMENDED.musicbrainz+=	musicbrainz>=2.1.2nb2
+BUILDLINK_API_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
+BUILDLINK_ABI_DEPENDS.musicbrainz+=	musicbrainz>=2.1.2nb2
 BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
 .endif	# MUSICBRAINZ_BUILDLINK3_MK
 
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index fc9fea4fbf3..6e283245ac0 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NAS_BUILDLINK3_MK:=	${NAS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnas}
 BUILDLINK_PACKAGES+=	nas
 
 .if !empty(NAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nas+=		nas>=1.4.2
-BUILDLINK_RECOMMENDED.nas?=	nas>=1.7bnb2
+BUILDLINK_API_DEPENDS.nas+=		nas>=1.4.2
+BUILDLINK_ABI_DEPENDS.nas?=	nas>=1.7bnb2
 BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
 .endif	# NAS_BUILDLINK3_MK
 
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index e9b3d548df2..b9abf86ea3c 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENAL_BUILDLINK3_MK:=	${OPENAL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenal}
 BUILDLINK_PACKAGES+=	openal
 
 .if !empty(OPENAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openal+=	openal>=20030125nb1
-BUILDLINK_RECOMMENDED.openal?=	openal>=20040816nb1
+BUILDLINK_API_DEPENDS.openal+=	openal>=20030125nb1
+BUILDLINK_ABI_DEPENDS.openal?=	openal>=20040816nb1
 BUILDLINK_PKGSRCDIR.openal?=	../../audio/openal
 .endif	# OPENAL_BUILDLINK3_MK
 
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
index b5a56e881f5..edfc55e74d1 100644
--- a/audio/portaudio/buildlink3.mk
+++ b/audio/portaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PORTAUDIO_BUILDLINK3_MK:=	${PORTAUDIO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nportaudio}
 BUILDLINK_PACKAGES+=	portaudio
 
 .if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.portaudio+=	portaudio>=18.1
-BUILDLINK_RECOMMENDED.portaudio?=	portaudio>=18.1nb2
+BUILDLINK_API_DEPENDS.portaudio+=	portaudio>=18.1
+BUILDLINK_ABI_DEPENDS.portaudio?=	portaudio>=18.1nb2
 BUILDLINK_PKGSRCDIR.portaudio?=	../../audio/portaudio
 .endif	# PORTAUDIO_BUILDLINK3_MK
 
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index d7611bb11e5..34a4b558655 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_OGG_BUILDLINK3_MK:=	${PY_OGG_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyogg}
 BUILDLINK_PACKAGES+=	pyogg
 
 .if !empty(PY_OGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
-BUILDLINK_RECOMMENDED.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
+BUILDLINK_API_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
+BUILDLINK_ABI_DEPENDS.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
 .endif	# PY_OGG_BUILDLINK3_MK
 
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
index 0f113ec2f23..d2e17b7c594 100644
--- a/audio/rplay/buildlink3.mk
+++ b/audio/rplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RPLAY_BUILDLINK3_MK:=	${RPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrplay}
 BUILDLINK_PACKAGES+=	rplay
 
 .if !empty(RPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rplay+=	rplay>=3.3.2nb1
-BUILDLINK_RECOMMENDED.rplay+=	rplay>=3.3.2nb2
+BUILDLINK_API_DEPENDS.rplay+=	rplay>=3.3.2nb1
+BUILDLINK_ABI_DEPENDS.rplay+=	rplay>=3.3.2nb2
 BUILDLINK_PKGSRCDIR.rplay?=	../../audio/rplay
 .endif	# RPLAY_BUILDLINK3_MK
 
diff --git a/audio/speex/buildlink3.mk b/audio/speex/buildlink3.mk
index 2d772af7b47..97927c137d9 100644
--- a/audio/speex/buildlink3.mk
+++ b/audio/speex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:36 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPEEX_BUILDLINK3_MK:=	${SPEEX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspeex}
 BUILDLINK_PACKAGES+=	speex
 
 .if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.speex+=	speex>=1.0.4
-BUILDLINK_RECOMMENDED.speex+=	speex>=1.0.4nb1
+BUILDLINK_API_DEPENDS.speex+=	speex>=1.0.4
+BUILDLINK_ABI_DEPENDS.speex+=	speex>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.speex?=	../../audio/speex
 .endif	# SPEEX_BUILDLINK3_MK
 
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index 238abebbc8e..4c353acf7c2 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 STREAMTUNER_BUILDLINK3_MK:=	${STREAMTUNER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nstreamtuner}
 BUILDLINK_PACKAGES+=	streamtuner
 
 .if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.streamtuner+=		streamtuner>=0.99
-BUILDLINK_RECOMMENDED.streamtuner?=	streamtuner>=0.99.99nb2
+BUILDLINK_API_DEPENDS.streamtuner+=		streamtuner>=0.99
+BUILDLINK_ABI_DEPENDS.streamtuner?=	streamtuner>=0.99.99nb2
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
 .endif	# STREAMTUNER_BUILDLINK3_MK
 
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index 0a2858fc371..d20fb54eb6a 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWEEP_BUILDLINK3_MK:=	${SWEEP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsweep}
 BUILDLINK_PACKAGES+=	sweep
 
 .if !empty(SWEEP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sweep+=	sweep>=0.8.2nb6
-BUILDLINK_RECOMMENDED.sweep+=	sweep>=0.8.3nb3
+BUILDLINK_API_DEPENDS.sweep+=	sweep>=0.8.2nb6
+BUILDLINK_ABI_DEPENDS.sweep+=	sweep>=0.8.3nb3
 BUILDLINK_PKGSRCDIR.sweep?=	../../audio/sweep
 .endif	# SWEEP_BUILDLINK3_MK
 
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index 642b9e4511c..5bf31ee2d01 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/06 00:09:02 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TAGLIB_BUILDLINK3_MK:=	${TAGLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntaglib}
 BUILDLINK_PACKAGES+=	taglib
 
 .if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.taglib+=	taglib>=1.0
-BUILDLINK_RECOMMENDED.taglib+=	taglib>=1.3
+BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.0
+BUILDLINK_ABI_DEPENDS.taglib+=	taglib>=1.3
 BUILDLINK_PKGSRCDIR.taglib?=	../../audio/taglib
 .endif	# TAGLIB_BUILDLINK3_MK
 
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index 8d1e2ba40e8..022e0d49223 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TREMOR_BUILDLINK3_MK:=	${TREMOR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntremor}
 BUILDLINK_PACKAGES+=	tremor
 
 .if !empty(TREMOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tremor+=	tremor>=1.0.2
-BUILDLINK_RECOMMENDED.tremor+=	tremor>=1.0.2nb5
+BUILDLINK_API_DEPENDS.tremor+=	tremor>=1.0.2
+BUILDLINK_ABI_DEPENDS.tremor+=	tremor>=1.0.2nb5
 BUILDLINK_PKGSRCDIR.tremor?=	../../audio/tremor
 .endif	# TREMOR_BUILDLINK3_MK
 
diff --git a/audio/tunepimp/buildlink3.mk b/audio/tunepimp/buildlink3.mk
index 6222b8896ba..e149eab0576 100644
--- a/audio/tunepimp/buildlink3.mk
+++ b/audio/tunepimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TUNEPIMP_BUILDLINK3_MK:=	${TUNEPIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntunepimp}
 BUILDLINK_PACKAGES+=	tunepimp
 
 .if !empty(TUNEPIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tunepimp+=	tunepimp>=0.3.0
-BUILDLINK_RECOMMENDED.tunepimp+=	tunepimp>=0.3.0nb4
+BUILDLINK_API_DEPENDS.tunepimp+=	tunepimp>=0.3.0
+BUILDLINK_ABI_DEPENDS.tunepimp+=	tunepimp>=0.3.0nb4
 BUILDLINK_PKGSRCDIR.tunepimp?=	../../audio/tunepimp
 .endif	# TUNEPIMP_BUILDLINK3_MK
 
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index a3b1545f00b..b6acac7d675 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/06 00:18:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:37 reed Exp $
 #
 
 DISTNAME=		tunesbrowser-0.3.0
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/tunesbrowser
 DEPENDS+=		gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
 DEPENDS+=		gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
 
-BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.4.0
+BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.4.0
 
 .include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .include "../../audio/libopendaap/buildlink3.mk"
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index 40d12cbe8c8..c698377c59f 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/03/10 22:32:21 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WSOUNDSERVER_BUILDLINK3_MK:=	${WSOUNDSERVER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwsoundserver}
 BUILDLINK_PACKAGES+=	wsoundserver
 
 .if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
-BUILDLINK_RECOMMENDED.wsoundserver+=	wsoundserver>=0.4.0nb7
+BUILDLINK_API_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
+BUILDLINK_ABI_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb7
 BUILDLINK_PKGSRCDIR.wsoundserver?=	../../audio/wsoundserver
 .endif	# WSOUNDSERVER_BUILDLINK3_MK
 
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index cff0f0adb54..3facdf5532a 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/17 06:49:23 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-mixer}
 BUILDLINK_PACKAGES+=	xfce4-mixer
 
 .if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mixer?=	xfce4-mixer>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mixer?=	xfce4-mixer>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 .endif	# XFCE4_MIXER_BUILDLINK3_MK
 
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index f200ca98077..1309b2a48d7 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-xmms-plugin}
 BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
 
 .if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb2
+BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
+BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
 .endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
index 749dddbc5a8..e1665af3d4d 100644
--- a/audio/xmms-esound/Makefile
+++ b/audio/xmms-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:21:37 reed Exp $
 #
 
 .include "../../audio/xmms/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT=	XMMS plugin to output sound through the esound daemon
 
 CONFLICTS+=	xmms<=1.2.7nb8
 
-BUILDLINK_DEPENDS.xmms+=	xmms>=1.2.7nb9
+BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb9
 
 BUILD_DIRS=	${WRKSRC}/Output/esd
 INSTALL_DIRS=	${WRKSRC}/Output/esd
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 036590934a6..b2c27529986 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:21:37 reed Exp $
 #
 
 DISTNAME=		xmms-mad-0.5.5
@@ -15,7 +15,7 @@ USE_TOOLS+=		pkg-config
 
 CPPFLAGS.NetBSD+=	-DHAVE_NANOSLEEP=1
 
-BUILDLINK_DEPENDS.libmad+=	libmad>=0.15.0bnb1
+BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0bnb1
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index b85f385a4ac..0727eb9a690 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XMMS_META_INPUT_BUILDLINK3_MK:=	${XMMS_META_INPUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms-meta-input}
 BUILDLINK_PACKAGES+=	xmms-meta-input
 
 .if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
-BUILDLINK_RECOMMENDED.xmms-meta-input?=	xmms-meta-input>=0.4nb2
+BUILDLINK_API_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
+BUILDLINK_ABI_DEPENDS.xmms-meta-input?=	xmms-meta-input>=0.4nb2
 BUILDLINK_PKGSRCDIR.xmms-meta-input?=	../../audio/xmms-meta-input
 .endif	# XMMS_META_INPUT_BUILDLINK3_MK
 
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index 1a9206765db..a2759e3c58a 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:37 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMMS_BUILDLINK3_MK:=	${XMMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxmms}
 BUILDLINK_PACKAGES+=	xmms
 
 .if !empty(XMMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms+=	xmms>=1.2.7nb10
-BUILDLINK_RECOMMENDED.xmms?=	xmms>=1.2.10nb6
+BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb10
+BUILDLINK_ABI_DEPENDS.xmms?=	xmms>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.xmms?=	../../audio/xmms
 .endif	# XMMS_BUILDLINK3_MK