Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

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

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

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

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

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

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

As discussed on tech-pkg.

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

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

46 files changed, 126 insertions, 126 deletions

diff --git a/multimedia/dirac/buildlink3.mk b/multimedia/dirac/buildlink3.mk
index 5fc589842c7..b135243744f 100644
--- a/multimedia/dirac/buildlink3.mk
+++ b/multimedia/dirac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/16 02:07:44 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:24 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DIRAC_BUILDLINK3_MK:=	${DIRAC_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirac}
 BUILDLINK_PACKAGES+=	dirac
 
 .if !empty(DIRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirac+=	dirac>=0.2.0
+BUILDLINK_API_DEPENDS.dirac+=	dirac>=0.2.0
 BUILDLINK_PKGSRCDIR.dirac?=	../../multimedia/dirac
 BUILDLINK_DEPMETHOD.dirac?=	build
 .endif	# DIRAC_BUILDLINK3_MK
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 1f4c8ad94c8..0a33cdef76d 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:14 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/04/06 06:22:24 reed Exp $
 #
 
 DISTNAME=	Video-DVDRip-0.50.18
@@ -24,7 +24,7 @@ DEPENDS+=	vcdimager>=0.7.12:../../sysutils/vcdimager-devel
 #DEPENDS+=	rar>=2.02:../../archivers/rar
 .endif
 
-BUILDLINK_DEPENDS.perl+=	perl>=5.6.0
+BUILDLINK_API_DEPENDS.perl+=	perl>=5.6.0
 
 USE_PKGLOCALEDIR=	YES
 
diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk
index ac7e444c2fc..7f49e91df8a 100644
--- a/multimedia/ffmpeg/buildlink3.mk
+++ b/multimedia/ffmpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/22 10:30:18 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FFMPEG_BUILDLINK3_MK:=	${FFMPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nffmpeg}
 BUILDLINK_PACKAGES+=	ffmpeg
 
 .if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.9pre1
-BUILDLINK_RECOMMENDED.ffmpeg?=	ffmpeg>=0.4.9pre1
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.9pre1
+BUILDLINK_ABI_DEPENDS.ffmpeg?=	ffmpeg>=0.4.9pre1
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 .endif	# FFMPEG_BUILDLINK3_MK
 
diff --git a/multimedia/gnome2-media/buildlink3.mk b/multimedia/gnome2-media/buildlink3.mk
index 1d4e5886c84..b8e7be1b726 100644
--- a/multimedia/gnome2-media/buildlink3.mk
+++ b/multimedia/gnome2-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:24 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-media}
 BUILDLINK_PACKAGES+=	gnome-media
 
 .if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
-BUILDLINK_RECOMMENDED.gnome-media?=	gnome-media>=2.12.0nb5
+BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.12.0nb5
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
 .endif	# GNOME_MEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/gst-plugins0.10-base/buildlink3.mk b/multimedia/gst-plugins0.10-base/buildlink3.mk
index a41616c218d..b53b481b908 100644
--- a/multimedia/gst-plugins0.10-base/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.10_BASE_BUILDLINK3_MK:=	${GST_PLUGINS0.10_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-base}
 BUILDLINK_PACKAGES+=	gst-plugins0.10-base
 
 .if !empty(GST_PLUGINS0.10_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-base?=	gst-plugins0.10-base>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base?=	gst-plugins0.10-base>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-base?=	../../multimedia/gst-plugins0.10-base
 .endif	# GST_PLUGINS0.10_BASE_BUILDLINK3_MK
 
diff --git a/multimedia/gst-plugins0.10-good/buildlink3.mk b/multimedia/gst-plugins0.10-good/buildlink3.mk
index 7539ca0a639..09c1c40efdf 100644
--- a/multimedia/gst-plugins0.10-good/buildlink3.mk
+++ b/multimedia/gst-plugins0.10-good/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:=	${GST_PLUGINS0.10_GOOD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.10-good}
 BUILDLINK_PACKAGES+=	gst-plugins0.10-good
 
 .if !empty(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-good?=	gst-plugins0.10-good>=0.10.1nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-good?=	gst-plugins0.10-good>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-good?=	../../multimedia/gst-plugins0.10-good
 .endif	# GST_PLUGINS0.10_GOOD_BUILDLINK3_MK
 
diff --git a/multimedia/gst-plugins0.8-xvid/Makefile b/multimedia/gst-plugins0.8-xvid/Makefile
index 707d099b270..8101cd00487 100644
--- a/multimedia/gst-plugins0.8-xvid/Makefile
+++ b/multimedia/gst-plugins0.8-xvid/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
 #
 
 GST_PLUGINS0.8_NAME=	xvid
 GST_PLUGINS0.8_DIR=	ext/xvid
 
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
+BUILDLINK_API_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
 PKGREVISION=		4
diff --git a/multimedia/gst-plugins0.8/Makefile.common b/multimedia/gst-plugins0.8/Makefile.common
index 5ce3a309afc..e81229ad30c 100644
--- a/multimedia/gst-plugins0.8/Makefile.common
+++ b/multimedia/gst-plugins0.8/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/04/06 06:22:25 reed Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.11
@@ -163,7 +163,7 @@ SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.g
 .include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .endif
 
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.8/buildlink3.mk b/multimedia/gst-plugins0.8/buildlink3.mk
index 0efed7fa42a..bd6f5125157 100644
--- a/multimedia/gst-plugins0.8/buildlink3.mk
+++ b/multimedia/gst-plugins0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_BUILDLINK3_MK:=	${GST_PLUGINS0.8_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8}
 BUILDLINK_PACKAGES+=	gst-plugins0.8
 
 .if !empty(GST_PLUGINS0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8?=	gst-plugins0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8?=	gst-plugins0.8>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8?=	../../multimedia/gst-plugins0.8
 .endif	# GST_PLUGINS0.8_BUILDLINK3_MK
 
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile
index 99a82e93cd1..4fcd6dfadf7 100644
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/12 12:41:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
 #
 
 DISTNAME=		gstreamer-0.10.4
@@ -41,7 +41,7 @@ PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
 .if ${OPSYS} == "NetBSD"
 # We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
 # won't work at all.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .endif
 .undef f
 
diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk
index 2fb3d41a9ef..3b6aac82957 100644
--- a/multimedia/gstreamer0.10/buildlink3.mk
+++ b/multimedia/gstreamer0.10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GSTREAMER0.10_BUILDLINK3_MK:=	${GSTREAMER0.10_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer0.10}
 BUILDLINK_PACKAGES+=	gstreamer0.10
 
 .if !empty(GSTREAMER0.10_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.1
-BUILDLINK_RECOMMENDED.gstreamer0.10?=	gstreamer0.10>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.1
+BUILDLINK_ABI_DEPENDS.gstreamer0.10?=	gstreamer0.10>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gstreamer0.10?=	../../multimedia/gstreamer0.10
 
 PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \
diff --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile
index 7bbd6d011cb..e926cc5a86e 100644
--- a/multimedia/gstreamer0.8/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:25 reed Exp $
 #
 
 DISTNAME=		gstreamer-0.8.11
@@ -39,7 +39,7 @@ PYTHON_VERSIONS_ACCEPTED=	24 23 22
 .if ${OPSYS} == "NetBSD"
 # We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
 # won't work at all.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .endif
 .undef f
 
diff --git a/multimedia/gstreamer0.8/buildlink3.mk b/multimedia/gstreamer0.8/buildlink3.mk
index f2bb182b328..dfb0d376471 100644
--- a/multimedia/gstreamer0.8/buildlink3.mk
+++ b/multimedia/gstreamer0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GSTREAMER0.8_BUILDLINK3_MK:=	${GSTREAMER0.8_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer0.8}
 BUILDLINK_PACKAGES+=	gstreamer0.8
 
 .if !empty(GSTREAMER0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gstreamer0.8?=	gstreamer0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gstreamer0.8?=	gstreamer0.8>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gstreamer0.8?=	../../multimedia/gstreamer0.8
 
 PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
diff --git a/multimedia/gstreamer0.8/plugins.mk b/multimedia/gstreamer0.8/plugins.mk
index 16f7600afab..8add471426d 100644
--- a/multimedia/gstreamer0.8/plugins.mk
+++ b/multimedia/gstreamer0.8/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.2 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: plugins.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GStreamer modules.  It takes care of rebuilding the corresponding databases
@@ -24,7 +24,7 @@ PRINT_PLIST_AWK+=	/^@dirrm libdata\/gstreamer-0.8/ { next; }
 .if defined(_GSTREAMER0.8_NO_DEPEND)
 BUILDLINK_PREFIX.gstreamer0.8=	${LOCALBASE}
 .else
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.1
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.1
 .  include "../../multimedia/gstreamer0.8/buildlink3.mk"
 .endif
 
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index b08a5d919be..aed3fad7e67 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/03/30 02:48:36 markd Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/06 06:22:25 reed Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 CATEGORIES=	multimedia
@@ -18,7 +18,7 @@ CONF_FILES+=		${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-mu
 
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc0anb1
+BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc0anb1
 .endif
 
 CONFIGURE_ARGS+=	--enable-cdparanoia
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index fbd0a5a2954..f3778dffe90 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdemultimedia}
 BUILDLINK_PACKAGES+=	kdemultimedia
 
 .if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdemultimedia?=	kdemultimedia>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdemultimedia?=	kdemultimedia>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/libassetml/buildlink3.mk b/multimedia/libassetml/buildlink3.mk
index 30a47b31391..3e43e550052 100644
--- a/multimedia/libassetml/buildlink3.mk
+++ b/multimedia/libassetml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBASSETML_BUILDLINK3_MK:=	${LIBASSETML_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibassetml}
 BUILDLINK_PACKAGES+=	libassetml
 
 .if !empty(LIBASSETML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassetml+=	libassetml>=1.2.1
-BUILDLINK_RECOMMENDED.libassetml?=	libassetml>=1.2.1nb1
+BUILDLINK_API_DEPENDS.libassetml+=	libassetml>=1.2.1
+BUILDLINK_ABI_DEPENDS.libassetml?=	libassetml>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.libassetml?=	../../multimedia/libassetml
 .endif	# LIBASSETML_BUILDLINK3_MK
 
diff --git a/multimedia/libdv-tools/Makefile b/multimedia/libdv-tools/Makefile
index 8013ca1c504..dbc1e4652bd 100644
--- a/multimedia/libdv-tools/Makefile
+++ b/multimedia/libdv-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/06 06:22:25 reed Exp $
 
 .include "../../multimedia/libdv/Makefile.common"
 
@@ -12,7 +12,7 @@ CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
 BUILD_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
 INSTALL_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
 
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.104nb1
+BUILDLINK_API_DEPENDS.libdv+=	libdv>=0.104nb1
 
 .include "../../devel/glib/buildlink3.mk"
 .include "../../multimedia/libdv/buildlink3.mk"
diff --git a/multimedia/libdv/buildlink3.mk b/multimedia/libdv/buildlink3.mk
index b1d9052b8d2..dcddfe0349a 100644
--- a/multimedia/libdv/buildlink3.mk
+++ b/multimedia/libdv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:25 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBDV_BUILDLINK3_MK:=	${LIBDV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdv}
 BUILDLINK_PACKAGES+=	libdv
 
 .if !empty(LIBDV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.102
-BUILDLINK_RECOMMENDED.libdv+=	libdv>=0.104nb2
+BUILDLINK_API_DEPENDS.libdv+=	libdv>=0.102
+BUILDLINK_ABI_DEPENDS.libdv+=	libdv>=0.104nb2
 BUILDLINK_PKGSRCDIR.libdv?=	../../multimedia/libdv
 .endif	# LIBDV_BUILDLINK3_MK
 
diff --git a/multimedia/libdvbpsi/buildlink3.mk b/multimedia/libdvbpsi/buildlink3.mk
index e3ebffe48cc..3ba1cd3df74 100644
--- a/multimedia/libdvbpsi/buildlink3.mk
+++ b/multimedia/libdvbpsi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVBPSI_BUILDLINK3_MK:=	${LIBDVBPSI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvbpsi}
 BUILDLINK_PACKAGES+=	libdvbpsi
 
 .if !empty(LIBDVBPSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
-BUILDLINK_RECOMMENDED.libdvbpsi+=	libdvbpsi>=0.1.3nb2
+BUILDLINK_API_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
+BUILDLINK_ABI_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3nb2
 BUILDLINK_PKGSRCDIR.libdvbpsi?=	../../multimedia/libdvbpsi
 .endif	# LIBDVBPSI_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk
index 8bda56fca5b..a74062a2d2f 100644
--- a/multimedia/libdvdcss/buildlink3.mk
+++ b/multimedia/libdvdcss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDCSS_BUILDLINK3_MK:=	${LIBDVDCSS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdcss}
 BUILDLINK_PACKAGES+=	libdvdcss
 
 .if !empty(LIBDVDCSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
-BUILDLINK_RECOMMENDED.libdvdcss+=	libdvdcss>=1.2.8nb1
+BUILDLINK_API_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
+BUILDLINK_ABI_DEPENDS.libdvdcss+=	libdvdcss>=1.2.8nb1
 BUILDLINK_PKGSRCDIR.libdvdcss?=	../../multimedia/libdvdcss
 .endif	# LIBDVDCSS_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk
index 988663fca3b..8c83398bb75 100644
--- a/multimedia/libdvdnav/buildlink3.mk
+++ b/multimedia/libdvdnav/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDNAV_BUILDLINK3_MK:=	${LIBDVDNAV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdnav}
 BUILDLINK_PACKAGES+=	libdvdnav
 
 .if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
-BUILDLINK_RECOMMENDED.libdvdnav+=	libdvdnav>=0.1.9nb1
+BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
+BUILDLINK_ABI_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9nb1
 BUILDLINK_PKGSRCDIR.libdvdnav?=	../../multimedia/libdvdnav
 .endif	# LIBDVDNAV_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk
index 655ddb2fb85..c32b2410fb9 100644
--- a/multimedia/libdvdplay/buildlink3.mk
+++ b/multimedia/libdvdplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDPLAY_BUILDLINK3_MK:=	${LIBDVDPLAY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdplay}
 BUILDLINK_PACKAGES+=	libdvdplay
 
 .if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
-BUILDLINK_RECOMMENDED.libdvdplay+=	libdvdplay>=1.0.1nb3
+BUILDLINK_API_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
+BUILDLINK_ABI_DEPENDS.libdvdplay+=	libdvdplay>=1.0.1nb3
 BUILDLINK_PKGSRCDIR.libdvdplay?=	../../multimedia/libdvdplay
 .endif	# LIBDVDPLAY_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index 1307e31405b..33b6ffe1488 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibdvdread}
 BUILDLINK_PACKAGES+=	libdvdread
 
 .if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdread+=		libdvdread>=0.9.4
-BUILDLINK_RECOMMENDED.libdvdread+=	libdvdread>=0.9.5nb2
+BUILDLINK_API_DEPENDS.libdvdread+=		libdvdread>=0.9.4
+BUILDLINK_ABI_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb2
 BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
 .endif	# LIBDVDREAD_BUILDLINK3_MK
 
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
index 492edf133f3..90677b7abb6 100644
--- a/multimedia/libflash/buildlink3.mk
+++ b/multimedia/libflash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBFLASH_BUILDLINK3_MK:=	${LIBFLASH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibflash}
 BUILDLINK_PACKAGES+=	libflash
 
 .if !empty(LIBFLASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libflash+=	libflash>=0.4.10nb4
-BUILDLINK_RECOMMENDED.libflash+=	libflash>=0.4.10nb6
+BUILDLINK_API_DEPENDS.libflash+=	libflash>=0.4.10nb4
+BUILDLINK_ABI_DEPENDS.libflash+=	libflash>=0.4.10nb6
 BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
 .endif	# LIBFLASH_BUILDLINK3_MK
 
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
index 7d066710682..6f1ff90b363 100644
--- a/multimedia/libmatroska/buildlink3.mk
+++ b/multimedia/libmatroska/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:26 reed Exp $
 #
 # This Makefile fragment is included by packages that use libmatroska.
 #
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmatroska}
 BUILDLINK_PACKAGES+=	libmatroska
 
 .if !empty(LIBMATROSKA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatroska+=	libmatroska>=0.8.0
-BUILDLINK_RECOMMENDED.libmatroska?=	libmatroska>=0.8.0nb1
+BUILDLINK_API_DEPENDS.libmatroska+=	libmatroska>=0.8.0
+BUILDLINK_ABI_DEPENDS.libmatroska?=	libmatroska>=0.8.0nb1
 BUILDLINK_PKGSRCDIR.libmatroska?=	../../multimedia/libmatroska
 .endif	# LIBMATROSKA_BUILDLINK3_MK
 
diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk
index 0a5fbdd5051..0c51f2e7aa3 100644
--- a/multimedia/libmpeg2/buildlink3.mk
+++ b/multimedia/libmpeg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMPEG2_BUILDLINK3_MK:=	${LIBMPEG2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg2}
 BUILDLINK_PACKAGES+=	libmpeg2
 
 .if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
-BUILDLINK_RECOMMENDED.libmpeg2+=	libmpeg2>=0.4.0bnb3
+BUILDLINK_API_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
+BUILDLINK_ABI_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0bnb3
 BUILDLINK_PKGSRCDIR.libmpeg2?=	../../multimedia/libmpeg2
 .endif	# LIBMPEG2_BUILDLINK3_MK
 
diff --git a/multimedia/libmpeg3/buildlink3.mk b/multimedia/libmpeg3/buildlink3.mk
index 059635b62e6..69756e6938f 100644
--- a/multimedia/libmpeg3/buildlink3.mk
+++ b/multimedia/libmpeg3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMPEG3_BUILDLINK3_MK:=	${LIBMPEG3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmpeg3}
 BUILDLINK_PACKAGES+=	libmpeg3
 
 .if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
-BUILDLINK_RECOMMENDED.libmpeg3?=	libmpeg3>=1.3nb6
+BUILDLINK_API_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
+BUILDLINK_ABI_DEPENDS.libmpeg3?=	libmpeg3>=1.3nb6
 BUILDLINK_PKGSRCDIR.libmpeg3?=	../../multimedia/libmpeg3
 .endif	# LIBMPEG3_BUILDLINK3_MK
 
diff --git a/multimedia/libogg/buildlink3.mk b/multimedia/libogg/buildlink3.mk
index 2bd05df2637..bc2e8549cf7 100644
--- a/multimedia/libogg/buildlink3.mk
+++ b/multimedia/libogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:26 reed Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibogg}
 BUILDLINK_PACKAGES+=	libogg
 
 .if !empty(LIBOGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libogg+=	libogg>=1.1
-BUILDLINK_RECOMMENDED.libogg+=	libogg>=1.1.2nb1
+BUILDLINK_API_DEPENDS.libogg+=	libogg>=1.1
+BUILDLINK_ABI_DEPENDS.libogg+=	libogg>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.libogg?=	../../multimedia/libogg
 .endif	# LIBOGG_BUILDLINK3_MK
 
diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk
index 7462ae368b5..84a32d6dc7b 100644
--- a/multimedia/libtheora/buildlink3.mk
+++ b/multimedia/libtheora/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBTHEORA_BUILDLINK3_MK:=	${LIBTHEORA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtheora}
 BUILDLINK_PACKAGES+=	libtheora
 
 .if !empty(LIBTHEORA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtheora+=	libtheora>=1.0alpha3
-BUILDLINK_RECOMMENDED.libtheora+=	libtheora>=1.0alpha3nb1
+BUILDLINK_API_DEPENDS.libtheora+=	libtheora>=1.0alpha3
+BUILDLINK_ABI_DEPENDS.libtheora+=	libtheora>=1.0alpha3nb1
 BUILDLINK_PKGSRCDIR.libtheora?=	../../multimedia/libtheora
 .endif	# LIBTHEORA_BUILDLINK3_MK
 
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 71fe6c2b82e..9a22ed14167 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/26 05:03:21 snj Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/06 06:22:26 reed Exp $
 
 DISTNAME=	lsdvd-0.10
 PKGREVISION=	3
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		autoconf213
 
-BUILDLINK_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb1
 
 pre-configure:
 	cd ${WRKSRC}; autoconf
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 7e92ab657bf..18ba9e31032 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MING_BUILDLINK3_MK:=	${MING_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nming}
 BUILDLINK_PACKAGES+=	ming
 
 .if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ming+=	ming>=0.2
+BUILDLINK_API_DEPENDS.ming+=	ming>=0.2
 BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
 .endif	# MING_BUILDLINK3_MK
 
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index fdbb0ecf1e5..f51a0f487fd 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:26 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MJPEGTOOLS_BUILDLINK3_MK:=	${MJPEGTOOLS_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmjpegtools}
 BUILDLINK_PACKAGES+=	mjpegtools
 
 .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
-BUILDLINK_RECOMMENDED.mjpegtools?=	mjpegtools>=1.8.0nb3
+BUILDLINK_API_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
+BUILDLINK_ABI_DEPENDS.mjpegtools?=	mjpegtools>=1.8.0nb3
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
 .endif	# MJPEGTOOLS_BUILDLINK3_MK
 
diff --git a/multimedia/mpeg-lib/buildlink3.mk b/multimedia/mpeg-lib/buildlink3.mk
index a1ae987dc4e..f0f530833a4 100644
--- a/multimedia/mpeg-lib/buildlink3.mk
+++ b/multimedia/mpeg-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:27 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MPEG_BUILDLINK3_MK:=	${MPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmpeg}
 BUILDLINK_PACKAGES+=	mpeg
 
 .if !empty(MPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
-BUILDLINK_RECOMMENDED.mpeg+=	mpeg>=1.3.1nb1
+BUILDLINK_API_DEPENDS.mpeg+=	mpeg>=1.3.1
+BUILDLINK_ABI_DEPENDS.mpeg+=	mpeg>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
 .endif	# MPEG_BUILDLINK3_MK
 
diff --git a/multimedia/ogle/buildlink3.mk b/multimedia/ogle/buildlink3.mk
index 7eaaf0ebb86..43dfc75b19f 100644
--- a/multimedia/ogle/buildlink3.mk
+++ b/multimedia/ogle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:17 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:27 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OGLE_BUILDLINK3_MK:=	${OGLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nogle}
 BUILDLINK_PACKAGES+=	ogle
 
 .if !empty(OGLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogle+=	ogle>=0.9.2
-BUILDLINK_RECOMMENDED.ogle+=	ogle>=0.9.2nb3
+BUILDLINK_API_DEPENDS.ogle+=	ogle>=0.9.2
+BUILDLINK_ABI_DEPENDS.ogle+=	ogle>=0.9.2nb3
 BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
 .endif	# OGLE_BUILDLINK3_MK
 
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
index fa4f1c8a8c1..b9ba103e552 100644
--- a/multimedia/openquicktime/buildlink3.mk
+++ b/multimedia/openquicktime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:27 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENQUICKTIME_BUILDLINK3_MK:=	${OPENQUICKTIME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenquicktime}
 BUILDLINK_PACKAGES+=	openquicktime
 
 .if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
-BUILDLINK_RECOMMENDED.openquicktime?=	openquicktime>=1.0nb4
+BUILDLINK_API_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
+BUILDLINK_ABI_DEPENDS.openquicktime?=	openquicktime>=1.0nb4
 BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
 .endif	# OPENQUICKTIME_BUILDLINK3_MK
 
diff --git a/multimedia/smpeg/buildlink3.mk b/multimedia/smpeg/buildlink3.mk
index 6a4491d18fa..97f7d838668 100644
--- a/multimedia/smpeg/buildlink3.mk
+++ b/multimedia/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:27 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsmpeg}
 BUILDLINK_PACKAGES+=	smpeg
 
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
-BUILDLINK_RECOMMENDED.smpeg+=	smpeg>=0.4.4nb12
+BUILDLINK_API_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
+BUILDLINK_ABI_DEPENDS.smpeg+=	smpeg>=0.4.4nb12
 BUILDLINK_PKGSRCDIR.smpeg?=	../../multimedia/smpeg
 .endif	# SMPEG_BUILDLINK3_MK
 
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 08daa6690b1..e51de71ee66 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:27 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswfdec}
 BUILDLINK_PACKAGES+=	swfdec
 
 .if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.2
-BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb5
+BUILDLINK_API_DEPENDS.swfdec+=	swfdec>=0.2.2
+BUILDLINK_ABI_DEPENDS.swfdec+=	swfdec>=0.2.2nb5
 BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 .endif	# SWFDEC_BUILDLINK3_MK
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index d03a25e47e1..014b265e65c 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2006/03/30 21:36:13 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/04/06 06:22:27 reed Exp $
 #
 
 DISTNAME=	totem-1.4.0
@@ -26,8 +26,8 @@ GCONF2_SCHEMAS=		totem.schemas
 GCONF2_SCHEMAS+=	totem-handlers.schemas
 GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
-BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 0a5cc74dd35..e60041b2253 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/06 06:22:28 reed Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -23,8 +23,8 @@ VLC_VER=		0.7.2
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=        --disable-vcd
 .endif
-BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
+BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
 
 CONFIGURE_ARGS+=	--disable-skins2
 CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index b2336ee8138..fd91b5dada6 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:29 reed Exp $
 #
 # This Makefile fragment is included by packages that use vlc.
 #
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+=	vlc
 
 .if !empty(VLC_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		vlc
-BUILDLINK_DEPENDS.vlc?=		vlc>=0.7.1
-BUILDLINK_RECOMMENDED.vlc?=	vlc>=0.7.2nb9
+BUILDLINK_API_DEPENDS.vlc?=		vlc>=0.7.1
+BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=0.7.2nb9
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .endif # VLC_BUILDLINK3_MK
 
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index 90b02a93138..55558721ce7 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/12 14:11:22 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:29 reed Exp $
 
 BUILDLINK_DEPMETHOD.x264-devel?=	build
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nx264-devel}
 BUILDLINK_PACKAGES+=	x264-devel
 
 .if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.x264-devel+=	x264-devel>=20060127
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20060127
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 .endif	# X264_DEVEL_BUILDLINK3_MK
 
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 9a01afc6888..45dc5435919 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/02/05 23:10:18 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/04/06 06:22:29 reed Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,7 @@ PKGREVISION=		5
 
 COMMENT=		Multimedia player library
 
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
 SUBST_CLASSES+=		oss w32path
 
@@ -24,7 +24,7 @@ SUBST_SED.w32path=	-e "s,@W32PATH@,${PREFIX}/lib/win32,"
 SUBST_MESSAGE.w32path=	"Fixing win32 dll path."
 
 # Needed to fix build problems under, at least, NetBSD/amd64.
-BUILDLINK_DEPENDS.libcdio+=	libcdio>=0.75
+BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk
index 2b459ae0625..d45f0f4bd46 100644
--- a/multimedia/xine-lib/buildlink3.mk
+++ b/multimedia/xine-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:10:19 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XINE_LIB_BUILDLINK3_MK:=	${XINE_LIB_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxine-lib}
 BUILDLINK_PACKAGES+=	xine-lib
 
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
-BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
-BUILDLINK_RECOMMENDED.xine-lib?=	xine-lib>=1.0.3anb5
+BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc3c
+BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a
+BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.0.3anb5
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .endif	# XINE_LIB_BUILDLINK3_MK
 
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 14ce0fc2401..3ddf149191a 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:30 reed Exp $
 #
 
 DISTNAME=		xine-ui-0.99.2
@@ -12,7 +12,7 @@ COMMENT=		Skinned xlib-based xine GUI
 
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.curl+=	curl>7.10.2
+BUILDLINK_API_DEPENDS.curl+=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
 USE_DIRS+=		xdg-1.1
diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk
index 90701b518aa..5561d76d063 100644
--- a/multimedia/xvidcore/buildlink3.mk
+++ b/multimedia/xvidcore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/13 18:24:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:30 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XVIDCORE_BUILDLINK3_MK:=	${XVIDCORE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxvidcore}
 BUILDLINK_PACKAGES+=	xvidcore
 
 .if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.0
-BUILDLINK_RECOMMENDED.xvidcore?=	xvidcore>=1.1.0nb1
+BUILDLINK_API_DEPENDS.xvidcore+=	xvidcore>=1.0.0
+BUILDLINK_ABI_DEPENDS.xvidcore?=	xvidcore>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.xvidcore?=	../../multimedia/xvidcore
 .endif	# XVIDCORE_BUILDLINK3_MK