summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
committerreed <reed@pkgsrc.org>2006-04-06 06:21:32 +0000
commit5a90099f096f9f96d89501e9046889e4d639d9e9 (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /graphics
parent21a75a2555bbbb0465d1e0ac639372e79a7e15dd (diff)
downloadpkgsrc-5a90099f096f9f96d89501e9046889e4d639d9e9.tar.gz
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).
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Coin/buildlink3.mk6
-rw-r--r--graphics/GLXKit/buildlink3.mk6
-rw-r--r--graphics/GUIlib/buildlink3.mk6
-rw-r--r--graphics/GeometryKit/buildlink3.mk6
-rw-r--r--graphics/GlutKit/buildlink3.mk6
-rw-r--r--graphics/ImageMagick/buildlink3.mk6
-rw-r--r--graphics/ImageMagick/options.mk4
-rw-r--r--graphics/MesaLib/buildlink3.mk6
-rw-r--r--graphics/MesaLib/builtin.mk4
-rw-r--r--graphics/OpenRM/buildlink3.mk6
-rw-r--r--graphics/RenderKit/buildlink3.mk6
-rw-r--r--graphics/SDLKit/buildlink3.mk6
-rw-r--r--graphics/SDL_image/buildlink3.mk6
-rw-r--r--graphics/TiffIO/Makefile4
-rw-r--r--graphics/aalib/buildlink3.mk6
-rw-r--r--graphics/cairo/Makefile12
-rw-r--r--graphics/cairo/buildlink3.mk12
-rw-r--r--graphics/cal3d/buildlink3.mk6
-rw-r--r--graphics/camlimages/Makefile4
-rw-r--r--graphics/camlimages/buildlink3.mk6
-rw-r--r--graphics/cinepaint/Makefile4
-rw-r--r--graphics/compface/buildlink3.mk6
-rw-r--r--graphics/digikam/Makefile6
-rw-r--r--graphics/digikam/buildlink3.mk4
-rw-r--r--graphics/eog2/Makefile4
-rw-r--r--graphics/epeg/buildlink3.mk4
-rw-r--r--graphics/feh/Makefile6
-rw-r--r--graphics/fnlib/buildlink3.mk6
-rw-r--r--graphics/freeglut/buildlink3.mk6
-rw-r--r--graphics/freetype-lib/buildlink3.mk8
-rw-r--r--graphics/freetype-utils/Makefile4
-rw-r--r--graphics/freetype2/buildlink3.mk6
-rw-r--r--graphics/freetype2/builtin.mk6
-rw-r--r--graphics/gd/buildlink3.mk6
-rw-r--r--graphics/gdchart/buildlink3.mk6
-rw-r--r--graphics/gdk-pixbuf-gnome/buildlink3.mk6
-rw-r--r--graphics/gdk-pixbuf/buildlink3.mk6
-rw-r--r--graphics/gimp/Makefile6
-rw-r--r--graphics/gimp/buildlink3.mk6
-rw-r--r--graphics/gimp1-base/buildlink3.mk6
-rw-r--r--graphics/gimp24/Makefile6
-rw-r--r--graphics/gimp24/buildlink3.mk6
-rw-r--r--graphics/gle/buildlink3.mk6
-rw-r--r--graphics/glitz/buildlink3.mk6
-rw-r--r--graphics/glu/Makefile4
-rw-r--r--graphics/glu/buildlink3.mk6
-rw-r--r--graphics/glu/builtin.mk6
-rw-r--r--graphics/glut/Makefile6
-rw-r--r--graphics/glut/buildlink3.mk6
-rw-r--r--graphics/gnome-icon-theme/Makefile4
-rw-r--r--graphics/gnome-icon-theme/buildlink3.mk6
-rw-r--r--graphics/graphviz/buildlink3.mk6
-rw-r--r--graphics/gst-plugins0.8-opengl/Makefile4
-rw-r--r--graphics/gst-plugins0.8-png/Makefile4
-rw-r--r--graphics/gthumb/Makefile4
-rw-r--r--graphics/gtkglext/buildlink3.mk4
-rw-r--r--graphics/hermes/buildlink3.mk6
-rw-r--r--graphics/hicolor-icon-theme/buildlink3.mk6
-rw-r--r--graphics/imlib/buildlink3.mk6
-rw-r--r--graphics/imlib2/buildlink3.mk6
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/jasper/buildlink3.mk6
-rw-r--r--graphics/jpeg/buildlink3.mk6
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics3/buildlink3.mk6
-rw-r--r--graphics/lcms/buildlink3.mk6
-rw-r--r--graphics/lib3ds/buildlink3.mk6
-rw-r--r--graphics/libart2/buildlink3.mk6
-rw-r--r--graphics/libexif-gtk/buildlink3.mk6
-rw-r--r--graphics/libexif/buildlink3.mk6
-rw-r--r--graphics/libgdgeda/buildlink3.mk6
-rw-r--r--graphics/libgdiplus/Makefile8
-rw-r--r--graphics/libgdiplus/buildlink3.mk6
-rw-r--r--graphics/libggi/buildlink3.mk6
-rw-r--r--graphics/libggiwmh/buildlink3.mk6
-rw-r--r--graphics/libgii/buildlink3.mk6
-rw-r--r--graphics/libgnomecanvas/buildlink3.mk6
-rw-r--r--graphics/libgnomecanvasmm/buildlink3.mk6
-rw-r--r--graphics/libkexif/buildlink3.mk6
-rw-r--r--graphics/libkipi/buildlink3.mk6
-rw-r--r--graphics/libpixman/buildlink3.mk4
-rw-r--r--graphics/librsvg/buildlink3.mk6
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--graphics/librsvg2/buildlink3.mk6
-rw-r--r--graphics/libungif/buildlink3.mk6
-rw-r--r--graphics/libvideogfx/buildlink3.mk6
-rw-r--r--graphics/libwmf/buildlink3.mk6
-rw-r--r--graphics/mng/buildlink3.mk6
-rw-r--r--graphics/netpbm/buildlink3.mk6
-rw-r--r--graphics/openexr/buildlink3.mk6
-rw-r--r--graphics/optipng/Makefile4
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--graphics/plotutils-nox11/buildlink3.mk4
-rw-r--r--graphics/plotutils/buildlink3.mk6
-rw-r--r--graphics/png/buildlink3.mk6
-rw-r--r--graphics/povray/Makefile4
-rw-r--r--graphics/py-imaging/buildlink3.mk6
-rw-r--r--graphics/py-imagingtk/Makefile4
-rw-r--r--graphics/ruby-imlib2/Makefile4
-rw-r--r--graphics/sane-backends/buildlink3.mk6
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/simage/buildlink3.mk6
-rw-r--r--graphics/tiff/buildlink3.mk6
-rw-r--r--graphics/tuxpaint/Makefile8
-rw-r--r--graphics/urt/buildlink3.mk6
-rw-r--r--graphics/wxsvg/buildlink3.mk6
-rw-r--r--graphics/xfce4-artwork/buildlink3.mk6
-rw-r--r--graphics/xfce4-icon-theme/buildlink3.mk6
-rw-r--r--graphics/xfce4-iconbox/buildlink3.mk6
-rw-r--r--graphics/xfig/Makefile4
-rw-r--r--graphics/xpm/buildlink3.mk6
-rw-r--r--graphics/xpm/builtin.mk4
115 files changed, 323 insertions, 323 deletions
diff --git a/graphics/Coin/buildlink3.mk b/graphics/Coin/buildlink3.mk
index 9183f204811..0554260f8c3 100644
--- a/graphics/Coin/buildlink3.mk
+++ b/graphics/Coin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:00 reed Exp $
#
# This Makefile fragment is included by packages that use Coin.
#
@@ -14,8 +14,8 @@ BUILDLINK_DEPENDS+= Coin
.if !empty(COIN_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= Coin
-BUILDLINK_DEPENDS.Coin+= Coin>=2.2.1
-BUILDLINK_RECOMMENDED.Coin?= Coin>=2.4.4nb1
+BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1
+BUILDLINK_ABI_DEPENDS.Coin?= Coin>=2.4.4nb1
BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin
.include "../../graphics/simage/buildlink3.mk"
diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk
index a1563bfbea5..c279fb5ef59 100644
--- a/graphics/GLXKit/buildlink3.mk
+++ b/graphics/GLXKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLXKIT_BUILDLINK3_MK:= ${GLXKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGLXKit}
BUILDLINK_PACKAGES+= GLXKit
.if !empty(GLXKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GLXKit?= GLXKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.GLXKit?= GLXKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit
.endif # GLXKIT_BUILDLINK3_MK
diff --git a/graphics/GUIlib/buildlink3.mk b/graphics/GUIlib/buildlink3.mk
index e09d4e08021..928a5ee39ef 100644
--- a/graphics/GUIlib/buildlink3.mk
+++ b/graphics/GUIlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GUILIB_BUILDLINK3_MK:= ${GUILIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGUIlib}
BUILDLINK_PACKAGES+= GUIlib
.if !empty(GUILIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GUIlib+= GUIlib>=1.1.0nb2
-BUILDLINK_RECOMMENDED.GUIlib+= GUIlib>=1.1.0nb6
+BUILDLINK_API_DEPENDS.GUIlib+= GUIlib>=1.1.0nb2
+BUILDLINK_ABI_DEPENDS.GUIlib+= GUIlib>=1.1.0nb6
BUILDLINK_PKGSRCDIR.GUIlib?= ../../graphics/GUIlib
.endif # GUILIB_BUILDLINK3_MK
diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk
index cde7f8fa6d6..103e76f3f44 100644
--- a/graphics/GeometryKit/buildlink3.mk
+++ b/graphics/GeometryKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GEOMETRYKIT_BUILDLINK3_MK:= ${GEOMETRYKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeometryKit}
BUILDLINK_PACKAGES+= GeometryKit
.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GeometryKit?= GeometryKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit
.endif # GEOMETRYKIT_BUILDLINK3_MK
diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk
index 8d75af82345..b7075b35a78 100644
--- a/graphics/GlutKit/buildlink3.mk
+++ b/graphics/GlutKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLUTKIT_BUILDLINK3_MK:= ${GLUTKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGlutKit}
BUILDLINK_PACKAGES+= GlutKit
.if !empty(GLUTKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GlutKit+= GlutKit>=0.3.1r2nb4
-BUILDLINK_RECOMMENDED.GlutKit?= GlutKit>=0.3.1r2nb11
+BUILDLINK_API_DEPENDS.GlutKit+= GlutKit>=0.3.1r2nb4
+BUILDLINK_ABI_DEPENDS.GlutKit?= GlutKit>=0.3.1r2nb11
BUILDLINK_PKGSRCDIR.GlutKit?= ../../graphics/GlutKit
.endif # GLUTKIT_BUILDLINK3_MK
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 3f0c20c183a..0ac4b0ce30a 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMAGEMAGICK_BUILDLINK3_MK:= ${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NImageMagick}
BUILDLINK_PACKAGES+= ImageMagick
.if !empty(IMAGEMAGICK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
-BUILDLINK_RECOMMENDED.ImageMagick+= ImageMagick>=6.2.6.0nb2
+BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
+BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.2.6.0nb2
BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
.endif # IMAGEMAGICK_BUILDLINK3_MK
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 186034be76a..5e7352f36c4 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/02/08 12:19:38 tv Exp $
+# $NetBSD: options.mk,v 1.6 2006/04/06 06:22:00 reed Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick
PKG_SUPPORTED_OPTIONS= x11
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mx11)
-BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0
+BUILDLINK_API_DEPENDS.jasper+= jasper>=1.701.0
DEPENDS+= mpeg2codec>=1.2:../../graphics/mpeg2codec
.include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 7dd32a26e5b..974377e5c88 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2006/03/21 22:18:55 kristerw Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2006/04/06 06:22:00 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MESALIB_BUILDLINK3_MK:= ${MESALIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NMesaLib}
BUILDLINK_PACKAGES+= MesaLib
.if !empty(MESALIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=3.4.2
-BUILDLINK_RECOMMENDED.MesaLib+= MesaLib>=6.4.1nb1
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=3.4.2
+BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=6.4.1nb1
BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib
.if !defined(BUILDING_MESA)
diff --git a/graphics/MesaLib/builtin.mk b/graphics/MesaLib/builtin.mk
index dac3b0dc577..317a10a45e7 100644
--- a/graphics/MesaLib/builtin.mk
+++ b/graphics/MesaLib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.13 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $
BUILTIN_PKG:= MesaLib
@@ -45,7 +45,7 @@ USE_BUILTIN.MesaLib= ${IS_BUILTIN.MesaLib}
. if defined(BUILTIN_PKG.MesaLib) && \
!empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib= yes
-. for dep in ${BUILDLINK_DEPENDS.MesaLib}
+. for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib!= \
if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 8033d69134e..98c7b81e181 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENRM_BUILDLINK3_MK:= ${OPENRM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NOpenRM}
BUILDLINK_PACKAGES+= OpenRM
.if !empty(OPENRM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.OpenRM+= OpenRM>=1.5.1
-BUILDLINK_RECOMMENDED.OpenRM?= OpenRM>=1.5.2nb3
+BUILDLINK_API_DEPENDS.OpenRM+= OpenRM>=1.5.1
+BUILDLINK_ABI_DEPENDS.OpenRM?= OpenRM>=1.5.2nb3
BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM
.endif # OPENRM_BUILDLINK3_MK
diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk
index 0a30e135742..069e3dd1169 100644
--- a/graphics/RenderKit/buildlink3.mk
+++ b/graphics/RenderKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RENDERKIT_BUILDLINK3_MK:= ${RENDERKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NRenderKit}
BUILDLINK_PACKAGES+= RenderKit
.if !empty(RENDERKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.RenderKit+= RenderKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.RenderKit?= RenderKit>=0.3.1r2nb9
+BUILDLINK_API_DEPENDS.RenderKit+= RenderKit>=0.3.1r2nb3
+BUILDLINK_ABI_DEPENDS.RenderKit?= RenderKit>=0.3.1r2nb9
BUILDLINK_PKGSRCDIR.RenderKit?= ../../graphics/RenderKit
.endif # RENDERKIT_BUILDLINK3_MK
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
index bc1efe3eb83..1afbfbd28c4 100644
--- a/graphics/SDLKit/buildlink3.mk
+++ b/graphics/SDLKit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDLKIT_BUILDLINK3_MK:= ${SDLKIT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDLKit}
BUILDLINK_PACKAGES+= SDLKit
.if !empty(SDLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDLKit+= SDLKit>=0.3.1r2nb5
-BUILDLINK_RECOMMENDED.SDLKit?= SDLKit>=0.3.1r2nb13
+BUILDLINK_API_DEPENDS.SDLKit+= SDLKit>=0.3.1r2nb5
+BUILDLINK_ABI_DEPENDS.SDLKit?= SDLKit>=0.3.1r2nb13
BUILDLINK_PKGSRCDIR.SDLKit?= ../../graphics/SDLKit
.endif # SDLKIT_BUILDLINK3_MK
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 17cd83d2209..117950263fd 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:27 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_IMAGE_BUILDLINK3_MK:= ${SDL_IMAGE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NSDL_image}
BUILDLINK_PACKAGES+= SDL_image
.if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
-BUILDLINK_RECOMMENDED.SDL_image+= SDL_image>=1.2.4nb3
+BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1
+BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.4nb3
BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image
BUILDLINK_INCDIRS.SDL_image?= include/SDL
.endif # SDL_IMAGE_BUILDLINK3_MK
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index a6da2b232ec..523fb52b60e 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/23 03:25:12 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= TiffIO-120e
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
BUILD_ENV+= QTDIR=${QTDIR:Q}
.include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_DEPENDS.tiff+= tiff>=3.8.1
+BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk
index 3d6182de179..1cffeab3100 100644
--- a/graphics/aalib/buildlink3.mk
+++ b/graphics/aalib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Naalib}
BUILDLINK_PACKAGES+= aalib
.if !empty(AALIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aalib+= aalib>=1.4.0.4
-BUILDLINK_RECOMMENDED.aalib+= aalib>=1.4.0.5nb2
+BUILDLINK_API_DEPENDS.aalib+= aalib>=1.4.0.4
+BUILDLINK_ABI_DEPENDS.aalib+= aalib>=1.4.0.5nb2
BUILDLINK_PKGSRCDIR.aalib?= ../../graphics/aalib
.endif # AALIB_BUILDLINK3_MK
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 7ada3ab723c..e3466ed8b89 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/02 19:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/04/06 06:22:01 reed Exp $
DISTNAME= cairo-1.0.4
CATEGORIES= graphics
@@ -29,11 +29,11 @@ PLIST_SUBST+= QUARTZ=
PLIST_SUBST+= QUARTZ="@comment "
.endif
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-BUILDLINK_DEPENDS.glitz+= glitz>=0.4.4
-BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.5
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.glitz+= glitz>=0.4.4
+BUILDLINK_API_DEPENDS.libpixman+= libpixman>=0.1.5
.include "../../mk/compiler.mk"
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 417eda7bfb0..3568376887a 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+
@@ -11,13 +11,13 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncairo}
BUILDLINK_PACKAGES+= cairo
.if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cairo+= cairo>=1.0.0nb2
-BUILDLINK_RECOMMENDED.cairo?= cairo>=1.0.2nb3
+BUILDLINK_API_DEPENDS.cairo+= cairo>=1.0.0nb2
+BUILDLINK_ABI_DEPENDS.cairo?= cairo>=1.0.2nb3
BUILDLINK_PKGSRCDIR.cairo?= ../../graphics/cairo
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
.endif # CAIRO_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/cal3d/buildlink3.mk b/graphics/cal3d/buildlink3.mk
index 9a04a18c9c8..d147301d9fe 100644
--- a/graphics/cal3d/buildlink3.mk
+++ b/graphics/cal3d/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAL3D_BUILDLINK3_MK:= ${CAL3D_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncal3d}
BUILDLINK_PACKAGES+= cal3d
.if !empty(CAL3D_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cal3d+= cal3d>=0.9.1
-BUILDLINK_RECOMMENDED.cal3d+= cal3d>=0.9.1nb2
+BUILDLINK_API_DEPENDS.cal3d+= cal3d>=0.9.1
+BUILDLINK_ABI_DEPENDS.cal3d+= cal3d>=0.9.1nb2
BUILDLINK_PKGSRCDIR.cal3d?= ../../graphics/cal3d
.endif # CAL3D_BUILDLINK3_MK
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 0ed47b29aeb..8eb57f06dd8 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:01 reed Exp $
DISTNAME= camlimages-2.2.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pauillac.inria.fr/camlimages/
COMMENT= Image processing library for Objective Caml
-BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.6
+BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.6
WRKSRC= ${WRKDIR}/camlimages-2.2
USE_PKGLOCALEDIR= yes
diff --git a/graphics/camlimages/buildlink3.mk b/graphics/camlimages/buildlink3.mk
index 7784c8f74a2..409913ec065 100644
--- a/graphics/camlimages/buildlink3.mk
+++ b/graphics/camlimages/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CAMLIMAGES_BUILDLINK3_MK:= ${CAMLIMAGES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncamlimages}
BUILDLINK_PACKAGES+= camlimages
.if !empty(CAMLIMAGES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.camlimages+= camlimages>=2.2.0
-BUILDLINK_RECOMMENDED.camlimages?= camlimages>=2.2.0nb1
+BUILDLINK_API_DEPENDS.camlimages+= camlimages>=2.2.0
+BUILDLINK_ABI_DEPENDS.camlimages?= camlimages>=2.2.0nb1
BUILDLINK_PKGSRCDIR.camlimages?= ../../graphics/camlimages
.endif # CAMLIMAGES_BUILDLINK3_MK
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index c7e51cf1d56..3430b868a69 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/17 23:42:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:01 reed Exp $
DISTNAME= cinepaint-0.20-2
PKGNAME= cinepaint-0.20.2
@@ -19,7 +19,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= cinepaint-gtk.pc.in
-BUILDLINK_DEPENDS.lcms+= lcms>=1.13 # needs _cmsLCMScolorSpace
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.13 # needs _cmsLCMScolorSpace
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk
index dd6c902233c..a5304c67c5b 100644
--- a/graphics/compface/buildlink3.mk
+++ b/graphics/compface/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:28 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COMPFACE_BUILDLINK3_MK:= ${COMPFACE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompface}
BUILDLINK_PACKAGES+= compface
.if !empty(COMPFACE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.compface+= compface>=1.4
-BUILDLINK_RECOMMENDED.compface?= compface>=1.5.1nb1
+BUILDLINK_API_DEPENDS.compface+= compface>=1.4
+BUILDLINK_ABI_DEPENDS.compface?= compface>=1.5.1nb1
BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface
.endif # COMPFACE_BUILDLINK3_MK
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index bd6453021cc..22576e707c9 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/30 03:20:04 markd Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/06 06:22:01 reed Exp $
DISTNAME= digikam-0.8.1
PKGREVISION= 2
@@ -17,8 +17,8 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.5.2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.5.2
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
diff --git a/graphics/digikam/buildlink3.mk b/graphics/digikam/buildlink3.mk
index f8b926a3688..03406d46b7a 100644
--- a/graphics/digikam/buildlink3.mk
+++ b/graphics/digikam/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/20 09:15:44 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DIGIKAM_BUILDLINK3_MK:= ${DIGIKAM_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndigikam}
BUILDLINK_PACKAGES+= digikam
.if !empty(DIGIKAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.digikam+= digikam>=0.8.1
+BUILDLINK_API_DEPENDS.digikam+= digikam>=0.8.1
BUILDLINK_PKGSRCDIR.digikam?= ../../graphics/digikam
.endif # DIGIKAM_BUILDLINK3_MK
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 9a36e67f9da..dc4ed4ff9ef 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/03/30 21:27:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= eog-2.14.0
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= eog.schemas
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.16
+BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.16
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk
index d396b386ce4..f896b2c8f03 100644
--- a/graphics/epeg/buildlink3.mk
+++ b/graphics/epeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/12/28 21:54:35 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
EPEG_BUILDLINK3_MK:= ${EPEG_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+= epeg
BUILDLINK_PACKAGES+= epeg
.if !empty(EPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.epeg+= epeg>=0.9.0
+BUILDLINK_API_DEPENDS.epeg+= epeg>=0.9.0
BUILDLINK_PKGSRCDIR.epeg?= ../../graphics/epeg
.endif # EPEG_BUILDLINK3_MK
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index e38f221b794..6241c285935 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/02/05 23:09:29 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/06 06:22:01 reed Exp $
#
DISTNAME= feh-1.3.4
@@ -17,8 +17,8 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-transform-name=s,cam,feh_cam,
REPLACE_PERL= cam/cam
-BUILDLINK_DEPENDS.giblib+= giblib>=1.2.4
-BUILDLINK_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h
+BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.4
+BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6bnb3 # includes jpegint.h
.include "../../devel/giblib/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/fnlib/buildlink3.mk b/graphics/fnlib/buildlink3.mk
index c859d8d3f0e..4b597d57698 100644
--- a/graphics/fnlib/buildlink3.mk
+++ b/graphics/fnlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FNLIB_BUILDLINK3_MK:= ${FNLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfnlib}
BUILDLINK_PACKAGES+= fnlib
.if !empty(FNLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fnlib+= fnlib>=0.5nb6
-BUILDLINK_RECOMMENDED.fnlib+= fnlib>=0.5nb9
+BUILDLINK_API_DEPENDS.fnlib+= fnlib>=0.5nb6
+BUILDLINK_ABI_DEPENDS.fnlib+= fnlib>=0.5nb9
BUILDLINK_PKGSRCDIR.fnlib?= ../../graphics/fnlib
.endif # FNLIB_BUILDLINK3_MK
diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk
index e35dd42342a..13fd78dd7da 100644
--- a/graphics/freeglut/buildlink3.mk
+++ b/graphics/freeglut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:01 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREEGLUT_BUILDLINK3_MK:= ${FREEGLUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreeglut}
BUILDLINK_PACKAGES+= freeglut
.if !empty(FREEGLUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freeglut+= freeglut>=2.2.0
-BUILDLINK_RECOMMENDED.freeglut+= freeglut>=2.2.0nb3
+BUILDLINK_API_DEPENDS.freeglut+= freeglut>=2.2.0
+BUILDLINK_ABI_DEPENDS.freeglut+= freeglut>=2.2.0nb3
BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut
.endif # FREEGLUT_BUILDLINK3_MK
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 35eaea90573..be747faea39 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE_BUILDLINK3_MK:= ${FREETYPE_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype}
BUILDLINK_PACKAGES+= freetype
.if !empty(FREETYPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
-BUILDLINK_RECOMMENDED.freetype+=freetype-lib>=1.3.1nb2
-BUILDLINK_RECOMMENDED.freetype?= freetype-lib>=1.3.1nb3
+BUILDLINK_API_DEPENDS.freetype+= freetype-lib>=1.3.1nb1
+BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2
+BUILDLINK_ABI_DEPENDS.freetype?= freetype-lib>=1.3.1nb3
BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib
.endif # FREETYPE_BUILDLINK3_MK
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index ea2c25ece1c..336879032d3 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:02 reed Exp $
.include "../../graphics/freetype-lib/Makefile.common"
@@ -6,7 +6,7 @@ PKGNAME= freetype-utils-${FT_VERS}
PKGREVISION= 2
COMMENT= Utilities for manipulating TrueType fonts
-BUILDLINK_DEPENDS.freetype= freetype-lib>=${FT_VERS}
+BUILDLINK_API_DEPENDS.freetype= freetype-lib>=${FT_VERS}
CONFIGURE_ARGS+= --with-x
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index b946e4acdb2..a2cc3811dd2 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FREETYPE2_BUILDLINK3_MK:= ${FREETYPE2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfreetype2}
BUILDLINK_PACKAGES+= freetype2
.if !empty(FREETYPE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.8
-BUILDLINK_RECOMMENDED.freetype2+= freetype2>=2.1.10nb1
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.8
+BUILDLINK_ABI_DEPENDS.freetype2+= freetype2>=2.1.10nb1
BUILDLINK_PKGSRCDIR.freetype2?= ../../graphics/freetype2
BUILDLINK_INCDIRS.freetype2?= include/freetype2
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk
index 8afcae8d44c..5cc02b3a736 100644
--- a/graphics/freetype2/builtin.mk
+++ b/graphics/freetype2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILTIN_PKG:= freetype2
@@ -51,7 +51,7 @@ USE_BUILTIN.freetype2= ${IS_BUILTIN.freetype2}
. if defined(BUILTIN_PKG.freetype2) && \
!empty(IS_BUILTIN.freetype2:M[yY][eE][sS])
USE_BUILTIN.freetype2= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.freetype2}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
USE_BUILTIN.freetype2!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \
@@ -74,7 +74,7 @@ CHECK_BUILTIN.freetype2?= no
.if !empty(CHECK_BUILTIN.freetype2:M[nN][oO])
. if !empty(USE_BUILTIN.freetype2:M[nN][oO])
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3
. endif
. if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 96238f4b09b..ef227f769bb 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngd}
BUILDLINK_PACKAGES+= gd
.if !empty(GD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gd+= gd>=2.0.15nb1
-BUILDLINK_RECOMMENDED.gd+= gd>=2.0.33nb2
+BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1
+BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.33nb2
BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd
.endif # GD_BUILDLINK3_MK
diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index c17df052b4f..25bdfc426be 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:17:05 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDCHART_BUILDLINK3_MK:= ${GDCHART_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdchart}
BUILDLINK_PACKAGES+= gdchart
.if !empty(GDCHART_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdchart+= gdchart>=0.11.4nb1
-BUILDLINK_RECOMMENDED.gdchart+= gdchart>=0.11.5nb1
+BUILDLINK_API_DEPENDS.gdchart+= gdchart>=0.11.4nb1
+BUILDLINK_ABI_DEPENDS.gdchart+= gdchart>=0.11.5nb1
BUILDLINK_PKGSRCDIR.gdchart?= ../../graphics/gdchart
.endif # GDCHART_BUILDLINK3_MK
diff --git a/graphics/gdk-pixbuf-gnome/buildlink3.mk b/graphics/gdk-pixbuf-gnome/buildlink3.mk
index fbfe519c312..530972375e1 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink3.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_GNOME_BUILDLINK3_MK:= ${GDK_PIXBUF_GNOME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf-gnome}
BUILDLINK_PACKAGES+= gdk-pixbuf-gnome
.if !empty(GDK_PIXBUF_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2
-BUILDLINK_RECOMMENDED.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.22.0nb4
+BUILDLINK_API_DEPENDS.gdk-pixbuf-gnome+= gdk-pixbuf-gnome>=0.22.0nb2
+BUILDLINK_ABI_DEPENDS.gdk-pixbuf-gnome?= gdk-pixbuf-gnome>=0.22.0nb4
BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?= ../../graphics/gdk-pixbuf-gnome
.endif # GDK_PIXBUF_GNOME_BUILDLINK3_MK
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 46bdf8add5e..e50e9ae1e1b 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngdk-pixbuf}
BUILDLINK_PACKAGES+= gdk-pixbuf
.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
-BUILDLINK_RECOMMENDED.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb7
+BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2
+BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb7
BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf
BUILDLINK_CPPFLAGS.gdk-pixbuf+= \
-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 068febda730..e3c24e2db45 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2006/03/08 09:50:12 itohy Exp $
+# $NetBSD: Makefile,v 1.136 2006/04/06 06:22:02 reed Exp $
DISTNAME= gimp-2.2.10
PKGREVISION= 3
@@ -31,9 +31,9 @@ PKGCONFIG_OVERRIDE+= gimpui.pc.in
.include "../../mk/bsd.prefs.mk"
USE_BUILTIN.fontconfig= no
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2.0
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-perl
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 920087068c9..3ffa6f319e3 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp}
BUILDLINK_PACKAGES+= gimp
.if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+= gimp>=2.2.9nb1
-BUILDLINK_RECOMMENDED.gimp?= gimp>=2.2.10nb2
+BUILDLINK_API_DEPENDS.gimp+= gimp>=2.2.9nb1
+BUILDLINK_ABI_DEPENDS.gimp?= gimp>=2.2.10nb2
BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp
.endif # GIMP_BUILDLINK3_MK
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 187128748f2..6bf9cb7a7e8 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BASE_BUILDLINK3_MK:= ${GIMP_BASE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp-base}
BUILDLINK_PACKAGES+= gimp-base
.if !empty(GIMP_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2
-BUILDLINK_RECOMMENDED.gimp-base+= gimp-base>=1.2.5nb5
+BUILDLINK_API_DEPENDS.gimp-base+= gimp-base>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb5
BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base
.endif # GIMP_BASE_BUILDLINK3_MK
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index 6c3ead3226a..5d12e56a0d2 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/02 09:49:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:02 reed Exp $
DISTNAME= gimp-2.3.7
PKGREVISION= 3
@@ -32,8 +32,8 @@ PKGCONFIG_OVERRIDE+= gimpui-2.0.pc.in
.include "../../mk/bsd.prefs.mk"
USE_BUILTIN.fontconfig= no
-BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2.0
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2.0
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-perl
diff --git a/graphics/gimp24/buildlink3.mk b/graphics/gimp24/buildlink3.mk
index 29a1d24b5e9..6d0b889a52b 100644
--- a/graphics/gimp24/buildlink3.mk
+++ b/graphics/gimp24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/03/06 00:18:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GIMP_BUILDLINK3_MK:= ${GIMP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngimp}
BUILDLINK_PACKAGES+= gimp
.if !empty(GIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp+= gimp>=2.3.4nb1
-BUILDLINK_RECOMMENDED.gimp?= gimp>=2.3.7nb1
+BUILDLINK_API_DEPENDS.gimp+= gimp>=2.3.4nb1
+BUILDLINK_ABI_DEPENDS.gimp?= gimp>=2.3.7nb1
BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp24
.endif # GIMP_BUILDLINK3_MK
diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk
index c1a0eb93eb3..d7fb585f3f2 100644
--- a/graphics/gle/buildlink3.mk
+++ b/graphics/gle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLE_BUILDLINK3_MK:= ${GLE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngle}
BUILDLINK_PACKAGES+= gle
.if !empty(GLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gle+= gle>=3.0.3
-BUILDLINK_RECOMMENDED.gle+= gle>=3.1.0nb2
+BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3
+BUILDLINK_ABI_DEPENDS.gle+= gle>=3.1.0nb2
BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle
.endif # GLE_BUILDLINK3_MK
diff --git a/graphics/glitz/buildlink3.mk b/graphics/glitz/buildlink3.mk
index 3c95dd67764..9b20a17457a 100644
--- a/graphics/glitz/buildlink3.mk
+++ b/graphics/glitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:31 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLITZ_BUILDLINK3_MK:= ${GLITZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglitz}
BUILDLINK_PACKAGES+= glitz
.if !empty(GLITZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glitz+= glitz>=0.4.4
-BUILDLINK_RECOMMENDED.glitz+= glitz>=0.4.4nb2
+BUILDLINK_API_DEPENDS.glitz+= glitz>=0.4.4
+BUILDLINK_ABI_DEPENDS.glitz+= glitz>=0.4.4nb2
BUILDLINK_PKGSRCDIR.glitz?= ../../graphics/glitz
.endif # GLITZ_BUILDLINK3_MK
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 1c07706c81f..f8896d4cb33 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/02/09 12:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.45 2006/04/06 06:22:02 reed Exp $
PKGNAME= ${DISTNAME:C/MesaLib/glu/}
COMMENT= GLU polygon tessellation facility for Mesa
@@ -12,7 +12,7 @@ USE_LANGUAGES= c c++
INSTLIBS= ${WRKSRC}/src/glu/sgi/libGLU.la
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
.include "../../graphics/MesaLib/buildlink3.mk"
pre-build:
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 083b084ed33..54cbadf846b 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLU_BUILDLINK3_MK:= ${GLU_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglu}
BUILDLINK_PACKAGES+= glu
.if !empty(GLU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glu+= glu>=3.4.2
-BUILDLINK_RECOMMENDED.glu+= glu>=6.4.1nb1
+BUILDLINK_API_DEPENDS.glu+= glu>=3.4.2
+BUILDLINK_ABI_DEPENDS.glu+= glu>=6.4.1nb1
BUILDLINK_PKGSRCDIR.glu?= ../../graphics/glu
.endif # GLU_BUILDLINK3_MK
diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk
index 474b0050a0b..b1b963b23dd 100644
--- a/graphics/glu/builtin.mk
+++ b/graphics/glu/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILTIN_PKG:= glu
@@ -45,7 +45,7 @@ USE_BUILTIN.glu= ${IS_BUILTIN.glu}
. if defined(BUILTIN_PKG.glu) && \
!empty(IS_BUILTIN.glu:M[yY][eE][sS])
USE_BUILTIN.glu= yes
-. for dep in ${BUILDLINK_DEPENDS.glu}
+. for dep in ${BUILDLINK_API_DEPENDS.glu}
. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
USE_BUILTIN.glu!= \
if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu:Q}; then \
@@ -68,7 +68,7 @@ CHECK_BUILTIN.glu?= no
.if !empty(CHECK_BUILTIN.glu:M[nN][oO])
. if !empty(USE_BUILTIN.glu:M[nN][oO])
-BUILDLINK_DEPENDS.glu+= glu>=6.0
+BUILDLINK_API_DEPENDS.glu+= glu>=6.0
. endif
. if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index a068e665a94..541b1291d98 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/02/09 12:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/06 06:22:02 reed Exp $
PKGNAME= ${DISTNAME:S/MesaLib/glut/}
COMMENT= GLUT Graphics library similar to SGI's OpenGL
@@ -8,8 +8,8 @@ CONFLICTS+= Mesa<3.2.1
.include "../../graphics/Mesa/Makefile.common"
-BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
-BUILDLINK_DEPENDS.glu+= glu>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=${MESA_VERSION}
+BUILDLINK_API_DEPENDS.glu+= glu>=${MESA_VERSION}
INSTLIBS= ${WRKSRC}/src/glut/glx/libglut.la
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 961cd7b8cfc..3a04c2601cf 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GLUT_BUILDLINK3_MK:= ${GLUT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglut}
BUILDLINK_PACKAGES+= glut
.if !empty(GLUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glut+= glut>=3.4.2
-BUILDLINK_RECOMMENDED.glut+= glut>=6.4.1nb1
+BUILDLINK_API_DEPENDS.glut+= glut>=3.4.2
+BUILDLINK_ABI_DEPENDS.glut+= glut>=6.4.1nb1
BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut
.endif # GLUT_BUILDLINK3_MK
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index fb2cbf5e16f..435c8b24a44 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/04/03 06:10:57 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/04/06 06:22:02 reed Exp $
#
DISTNAME= gnome-icon-theme-2.14.2
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in
-BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5
+BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5
HICOLOR_ICON_THEME_DEPEND_ONLY= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk
index 33a6fd1c0d3..70b8b2b4670 100644
--- a/graphics/gnome-icon-theme/buildlink3.mk
+++ b/graphics/gnome-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/03/30 21:45:33 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GNOME_ICON_THEME_BUILDLINK3_MK:= ${GNOME_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-icon-theme}
BUILDLINK_PACKAGES+= gnome-icon-theme
.if !empty(GNOME_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-icon-theme?= gnome-icon-theme>=2.12.1nb2
+BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-icon-theme?= gnome-icon-theme>=2.12.1nb2
BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme
# intltool-{extract,merge,update} are Perl scripts included in the sources
diff --git a/graphics/graphviz/buildlink3.mk b/graphics/graphviz/buildlink3.mk
index ef3986c6cd3..6eee6793c25 100644
--- a/graphics/graphviz/buildlink3.mk
+++ b/graphics/graphviz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:32 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:02 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GRAPHVIZ_BUILDLINK3_MK:= ${GRAPHVIZ_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngraphviz}
BUILDLINK_PACKAGES+= graphviz
.if !empty(GRAPHVIZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.graphviz+= graphviz>=1.12
-BUILDLINK_RECOMMENDED.graphviz+= graphviz>=2.6nb3
+BUILDLINK_API_DEPENDS.graphviz+= graphviz>=1.12
+BUILDLINK_ABI_DEPENDS.graphviz+= graphviz>=2.6nb3
BUILDLINK_PKGSRCDIR.graphviz?= ../../graphics/graphviz
.endif # GRAPHVIZ_BUILDLINK3_MK
diff --git a/graphics/gst-plugins0.8-opengl/Makefile b/graphics/gst-plugins0.8-opengl/Makefile
index 26dbea1b3a1..7a02538999f 100644
--- a/graphics/gst-plugins0.8-opengl/Makefile
+++ b/graphics/gst-plugins0.8-opengl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:02 reed Exp $
#
GST_PLUGINS0.8_NAME= opengl
@@ -7,7 +7,7 @@ GST_PLUGINS0.8_DIR= sys/glsink
.include "../../multimedia/gst-plugins0.8/Makefile.common"
PKGREVISION= 4
-BUILDLINK_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.7nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.8+= gst-plugins0.8>=0.8.7nb1
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gst-plugins0.8-png/Makefile b/graphics/gst-plugins0.8-png/Makefile
index 4dc58b1274c..1aa80e6664e 100644
--- a/graphics/gst-plugins0.8-png/Makefile
+++ b/graphics/gst-plugins0.8-png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:03 reed Exp $
#
GST_PLUGINS0.8_NAME= png
@@ -8,7 +8,7 @@ GST_PLUGINS0.8_FLAG= pngenc
.include "../../multimedia/gst-plugins0.8/Makefile.common"
PKGREVISION= 4
-BUILDLINK_DEPENDS.png+= png>=1.2.5nb3 # requires libpng12.pc
+BUILDLINK_API_DEPENDS.png+= png>=1.2.5nb3 # requires libpng12.pc
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index c1a5af70826..b245f3148d6 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:03 reed Exp $
DISTNAME= gthumb-2.6.9
PKGREVISION= 2
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
GCONF2_SCHEMAS+= gthumb.schemas
-BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk
index 5b460466c34..800a13cb4bb 100644
--- a/graphics/gtkglext/buildlink3.mk
+++ b/graphics/gtkglext/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/13 21:11:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GTKGLEXT_BUILDLINK3_MK:= ${GTKGLEXT_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtkglext}
BUILDLINK_PACKAGES+= gtkglext
.if !empty(GTKGLEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglext+= gtkglext>=1.2.0
+BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0
BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext
.endif # GTKGLEXT_BUILDLINK3_MK
diff --git a/graphics/hermes/buildlink3.mk b/graphics/hermes/buildlink3.mk
index e5a14e09c30..0a4f703a928 100644
--- a/graphics/hermes/buildlink3.mk
+++ b/graphics/hermes/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HERMES_BUILDLINK3_MK:= ${HERMES_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NHermes}
BUILDLINK_PACKAGES+= Hermes
.if !empty(HERMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Hermes+= Hermes>=1.3.2
-BUILDLINK_RECOMMENDED.Hermes+= Hermes>=1.3.3nb2
+BUILDLINK_API_DEPENDS.Hermes+= Hermes>=1.3.2
+BUILDLINK_ABI_DEPENDS.Hermes+= Hermes>=1.3.3nb2
BUILDLINK_PKGSRCDIR.Hermes?= ../../graphics/hermes
.endif # HERMES_BUILDLINK3_MK
diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk
index 97bc5c5f19d..7f94be12ce2 100644
--- a/graphics/hicolor-icon-theme/buildlink3.mk
+++ b/graphics/hicolor-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/30 20:47:44 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhicolor-icon-theme}
BUILDLINK_PACKAGES+= hicolor-icon-theme
.if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4
-BUILDLINK_RECOMMENDED.hicolor-icon-theme+= hicolor-icon-theme>=0.5nb1
+BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4
+BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.5nb1
BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index d61603861d8..ee615d3d936 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB_BUILDLINK3_MK:= ${IMLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib}
BUILDLINK_PACKAGES+= imlib
.if !empty(IMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imlib+= imlib>=1.9.14nb5
-BUILDLINK_RECOMMENDED.imlib+= imlib>=1.9.15nb3
+BUILDLINK_API_DEPENDS.imlib+= imlib>=1.9.14nb5
+BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb3
BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib
.endif # IMLIB_BUILDLINK3_MK
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index aabbf4957a7..da12d117bc9 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:09:33 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
IMLIB2_BUILDLINK3_MK:= ${IMLIB2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimlib2}
BUILDLINK_PACKAGES+= imlib2
.if !empty(IMLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.1.0nb2
-BUILDLINK_RECOMMENDED.imlib2+= imlib2>=1.2.0nb4
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.1.0nb2
+BUILDLINK_ABI_DEPENDS.imlib2+= imlib2>=1.2.0nb4
BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2
.endif # IMLIB2_BUILDLINK3_MK
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 70f4d7a1654..90270c74b3f 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/06 18:50:21 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/06 06:22:03 reed Exp $
DISTNAME= inkscape-0.43
PKGREVISION= 4
@@ -23,7 +23,7 @@ USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.4
+BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.4
.include "../../devel/boehm-gc/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index bf9eba82b31..6a5288409d6 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JASPER_BUILDLINK3_MK:= ${JASPER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njasper}
BUILDLINK_PACKAGES+= jasper
.if !empty(JASPER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jasper+= jasper>=1.600.0
-BUILDLINK_RECOMMENDED.jasper+= jasper>=1.701.0nb2
+BUILDLINK_API_DEPENDS.jasper+= jasper>=1.600.0
+BUILDLINK_ABI_DEPENDS.jasper+= jasper>=1.701.0nb2
BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper
.endif # JASPER_BUILDLINK3_MK
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index b20cffbde60..e7275c2e534 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
JPEG_BUILDLINK3_MK:= ${JPEG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njpeg}
BUILDLINK_PACKAGES+= jpeg
.if !empty(JPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jpeg+= jpeg>=6b
-BUILDLINK_RECOMMENDED.jpeg+= jpeg>=6bnb2
+BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6b
+BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=6bnb2
BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg
.endif # JPEG_BUILDLINK3_MK
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 4f40fe630c0..0d462b13cdd 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:03 reed Exp $
DISTNAME= kbarcode-1.8.1
PKGREVISION= 4
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
DEPENDS+= barcode-[0-9]*:../../graphics/barcode
# Works only with KDE 3.3.x
-BUILDLINK_DEPENDS.kdelibs+= kdelibs>=3.3.0
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index d56a545c344..f6b3fb5fb66 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/03/30 03:02:01 markd Exp $
+# $NetBSD: Makefile,v 1.64 2006/04/06 06:22:03 reed Exp $
DISTNAME= kdegraphics-${_KDE_VERSION}
CATEGORIES= graphics
@@ -9,7 +9,7 @@ COMMENT= Graphics programs for the KDE integrated X11 desktop
USE_DIRS+= xdg-1.1
USE_TOOLS+= gs:run pkg-config
-BUILDLINK_DEPENDS.lcms+= lcms>=1.12
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.12
REPLACE_PERL+= kghostview/update-to-xt-names.pl
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 16862e632d0..c7838b509cd 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEGRAPHICS_BUILDLINK3_MK:= ${KDEGRAPHICS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdegraphics}
BUILDLINK_PACKAGES+= kdegraphics
.if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdegraphics?= kdegraphics>=3.5.1nb2
+BUILDLINK_API_DEPENDS.kdegraphics+= kdegraphics>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdegraphics?= kdegraphics>=3.5.1nb2
BUILDLINK_PKGSRCDIR.kdegraphics?= ../../graphics/kdegraphics3
.endif # KDEGRAPHICS_BUILDLINK3_MK
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 9796c19a986..e6efb67caa3 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:54 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlcms}
BUILDLINK_PACKAGES+= lcms
.if !empty(LCMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lcms+= lcms>=1.06
-BUILDLINK_RECOMMENDED.lcms+= lcms>=1.12nb2
+BUILDLINK_API_DEPENDS.lcms+= lcms>=1.06
+BUILDLINK_ABI_DEPENDS.lcms+= lcms>=1.12nb2
BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms
BUILDLINK_TARGETS+= buildlink-include-lcms
diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk
index 45ea3f90c0d..e922cbbc649 100644
--- a/graphics/lib3ds/buildlink3.mk
+++ b/graphics/lib3ds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIB3DS_BUILDLINK3_MK:= ${LIB3DS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlib3ds}
BUILDLINK_PACKAGES+= lib3ds
.if !empty(LIB3DS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lib3ds+= lib3ds>=1.2.0nb2
-BUILDLINK_RECOMMENDED.lib3ds?= lib3ds>=1.2.0nb4
+BUILDLINK_API_DEPENDS.lib3ds+= lib3ds>=1.2.0nb2
+BUILDLINK_ABI_DEPENDS.lib3ds?= lib3ds>=1.2.0nb4
BUILDLINK_PKGSRCDIR.lib3ds?= ../../graphics/lib3ds
.endif # LIB3DS_BUILDLINK3_MK
diff --git a/graphics/libart2/buildlink3.mk b/graphics/libart2/buildlink3.mk
index ee8a17b71ee..d3866d0e5c7 100644
--- a/graphics/libart2/buildlink3.mk
+++ b/graphics/libart2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBART2_BUILDLINK3_MK:= ${LIBART2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibart2}
BUILDLINK_PACKAGES+= libart2
.if !empty(LIBART2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libart2+= libart2>=2.3.10nb1
-BUILDLINK_RECOMMENDED.libart2+= libart2>=2.3.16nb1
+BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.10nb1
+BUILDLINK_ABI_DEPENDS.libart2+= libart2>=2.3.16nb1
BUILDLINK_PKGSRCDIR.libart2?= ../../graphics/libart2
.endif # LIBART2_BUILDLINK3_MK
diff --git a/graphics/libexif-gtk/buildlink3.mk b/graphics/libexif-gtk/buildlink3.mk
index 04bfc18beb7..b64df2951a4 100644
--- a/graphics/libexif-gtk/buildlink3.mk
+++ b/graphics/libexif-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:03 reed Exp $
#
# This file was created automatically using createbuildlink-3.4.
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif-gtk}
BUILDLINK_PACKAGES+= libexif-gtk
.if !empty(LIBEXIF_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7
-BUILDLINK_RECOMMENDED.libexif-gtk+= libexif-gtk>=0.3.5nb3
+BUILDLINK_API_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.3nb7
+BUILDLINK_ABI_DEPENDS.libexif-gtk+= libexif-gtk>=0.3.5nb3
BUILDLINK_PKGSRCDIR.libexif-gtk?= ../../graphics/libexif-gtk
.endif # LIBEXIF_GTK_BUILDLINK3_MK
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
index 818da8a20c9..000178dee1a 100644
--- a/graphics/libexif/buildlink3.mk
+++ b/graphics/libexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:03 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibexif}
BUILDLINK_PACKAGES+= libexif
.if !empty(LIBEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libexif+= libexif>=0.6.11
-BUILDLINK_RECOMMENDED.libexif+= libexif>=0.6.13nb1
+BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.11
+BUILDLINK_ABI_DEPENDS.libexif+= libexif>=0.6.13nb1
BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif
.endif # LIBEXIF_BUILDLINK3_MK
diff --git a/graphics/libgdgeda/buildlink3.mk b/graphics/libgdgeda/buildlink3.mk
index adb880fb6db..5625da53646 100644
--- a/graphics/libgdgeda/buildlink3.mk
+++ b/graphics/libgdgeda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDGEDA_BUILDLINK3_MK:= ${LIBGDGEDA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdgeda}
BUILDLINK_PACKAGES+= libgdgeda
.if !empty(LIBGDGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
-BUILDLINK_RECOMMENDED.libgdgeda+= libgdgeda>=2.0.15nb2
+BUILDLINK_API_DEPENDS.libgdgeda+= libgdgeda>=2.0.15
+BUILDLINK_ABI_DEPENDS.libgdgeda+= libgdgeda>=2.0.15nb2
BUILDLINK_PKGSRCDIR.libgdgeda?= ../../graphics/libgdgeda
.endif # LIBGDGEDA_BUILDLINK3_MK
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index a20606bef27..d50d35ef26d 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:04 reed Exp $
#
DISTNAME= libgdiplus-1.1.11
@@ -17,9 +17,9 @@ PKGCONFIG_OVERRIDE+= libgdiplus.pc.in
PKGCONFIG_OVERRIDE+= cairo/cairo.pc.in
GNU_CONFIGURE= yes
-BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
-BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
-BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
+BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.5
+BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8
BUILDLINK_TRANSFORM+= rm:-Werror
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index b81b8584f05..2935fb51155 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGDIPLUS_BUILDLINK3_MK:= ${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgdiplus}
BUILDLINK_PACKAGES+= libgdiplus
.if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgdiplus+= libgdiplus>=1.1.11
-BUILDLINK_RECOMMENDED.libgdiplus?= libgdiplus>=1.1.11nb2
+BUILDLINK_API_DEPENDS.libgdiplus+= libgdiplus>=1.1.11
+BUILDLINK_ABI_DEPENDS.libgdiplus?= libgdiplus>=1.1.11nb2
BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus
.endif # LIBGDIPLUS_BUILDLINK3_MK
diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk
index 59069d455c8..fb933660afa 100644
--- a/graphics/libggi/buildlink3.mk
+++ b/graphics/libggi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGGI_BUILDLINK3_MK:= ${LIBGGI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggi}
BUILDLINK_PACKAGES+= libggi
.if !empty(LIBGGI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libggi+= libggi>=2.1.0
-BUILDLINK_RECOMMENDED.libggi?= libggi>=2.1.1nb1
+BUILDLINK_API_DEPENDS.libggi+= libggi>=2.1.0
+BUILDLINK_ABI_DEPENDS.libggi?= libggi>=2.1.1nb1
BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi
.endif # LIBGGI_BUILDLINK3_MK
diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk
index 2b3f6cafcca..bbea4ad9190 100644
--- a/graphics/libggiwmh/buildlink3.mk
+++ b/graphics/libggiwmh/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGGIWMH_BUILDLINK3_MK:= ${LIBGGIWMH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibggiwmh}
BUILDLINK_PACKAGES+= libggiwmh
.if !empty(LIBGGIWMH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libggiwmh+= libggiwmh>=0.2.0
-BUILDLINK_RECOMMENDED.libggiwmh?= libggiwmh>=0.2.1nb1
+BUILDLINK_API_DEPENDS.libggiwmh+= libggiwmh>=0.2.0
+BUILDLINK_ABI_DEPENDS.libggiwmh?= libggiwmh>=0.2.1nb1
BUILDLINK_PKGSRCDIR.libggiwmh?= ../../graphics/libggiwmh
.endif # LIBGGIWMH_BUILDLINK3_MK
diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk
index d2bab552755..51789e0d99d 100644
--- a/graphics/libgii/buildlink3.mk
+++ b/graphics/libgii/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGII_BUILDLINK3_MK:= ${LIBGII_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgii}
BUILDLINK_PACKAGES+= libgii
.if !empty(LIBGII_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgii+= libgii>=0.9.0
-BUILDLINK_RECOMMENDED.libgii?= libgii>=0.9.1nb1
+BUILDLINK_API_DEPENDS.libgii+= libgii>=0.9.0
+BUILDLINK_ABI_DEPENDS.libgii?= libgii>=0.9.1nb1
BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii
.endif # LIBGII_BUILDLINK3_MK
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index cfb67bc9cf1..e2b9402b37b 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVAS_BUILDLINK3_MK:= ${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvas}
BUILDLINK_PACKAGES+= libgnomecanvas
.if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomecanvas+= libgnomecanvas>=2.12.0nb2
+BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.12.0nb2
BUILDLINK_PKGSRCDIR.libgnomecanvas?= ../../graphics/libgnomecanvas
.endif # LIBGNOMECANVAS_BUILDLINK3_MK
diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk
index fafbf46f1d3..fb858f6e971 100644
--- a/graphics/libgnomecanvasmm/buildlink3.mk
+++ b/graphics/libgnomecanvasmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBGNOMECANVASMM_BUILDLINK3_MK:= ${LIBGNOMECANVASMM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomecanvasmm}
BUILDLINK_PACKAGES+= libgnomecanvasmm
.if !empty(LIBGNOMECANVASMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomecanvasmm?= libgnomecanvasmm>=2.12.0nb2
+BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomecanvasmm?= libgnomecanvasmm>=2.12.0nb2
BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm
.endif # LIBGNOMECANVASMM_BUILDLINK3_MK
diff --git a/graphics/libkexif/buildlink3.mk b/graphics/libkexif/buildlink3.mk
index 73418f848f0..efadcd2a4ea 100644
--- a/graphics/libkexif/buildlink3.mk
+++ b/graphics/libkexif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKEXIF_BUILDLINK3_MK:= ${LIBKEXIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkexif}
BUILDLINK_PACKAGES+= libkexif
.if !empty(LIBKEXIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libkexif+= libkexif>=0.2.1
-BUILDLINK_RECOMMENDED.libkexif?= libkexif>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libkexif+= libkexif>=0.2.1
+BUILDLINK_ABI_DEPENDS.libkexif?= libkexif>=0.2.2nb2
BUILDLINK_PKGSRCDIR.libkexif?= ../../graphics/libkexif
.endif # LIBKEXIF_BUILDLINK3_MK
diff --git a/graphics/libkipi/buildlink3.mk b/graphics/libkipi/buildlink3.mk
index 8af77ea864c..225335f0cae 100644
--- a/graphics/libkipi/buildlink3.mk
+++ b/graphics/libkipi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBKIPI_BUILDLINK3_MK:= ${LIBKIPI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibkipi}
BUILDLINK_PACKAGES+= libkipi
.if !empty(LIBKIPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libkipi+= libkipi>=0.1
-BUILDLINK_RECOMMENDED.libkipi?= libkipi>=0.1.2nb2
+BUILDLINK_API_DEPENDS.libkipi+= libkipi>=0.1
+BUILDLINK_ABI_DEPENDS.libkipi?= libkipi>=0.1.2nb2
BUILDLINK_PKGSRCDIR.libkipi?= ../../graphics/libkipi
. for dir in share/kde/apps/kipi/data share/kde/apps/kipi
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index 162cebf39a9..1026b9ae17a 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/27 12:28:08 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBPIXMAN_BUILDLINK3_MK:= ${LIBPIXMAN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibpixman}
BUILDLINK_PACKAGES+= libpixman
.if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpixman+= libpixman>=0.1.4
+BUILDLINK_API_DEPENDS.libpixman+= libpixman>=0.1.4
BUILDLINK_PKGSRCDIR.libpixman?= ../../graphics/libpixman
.endif # LIBPIXMAN_BUILDLINK3_MK
diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk
index 0041e994a6a..6a255cc2dc8 100644
--- a/graphics/librsvg/buildlink3.mk
+++ b/graphics/librsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG_BUILDLINK3_MK:= ${LIBRSVG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg}
BUILDLINK_PACKAGES+= librsvg
.if !empty(LIBRSVG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg+= librsvg>=1.0.1nb5
-BUILDLINK_RECOMMENDED.librsvg+= librsvg>=1.0.3nb1
+BUILDLINK_API_DEPENDS.librsvg+= librsvg>=1.0.1nb5
+BUILDLINK_ABI_DEPENDS.librsvg+= librsvg>=1.0.3nb1
BUILDLINK_PKGSRCDIR.librsvg?= ../../graphics/librsvg
.endif # LIBRSVG_BUILDLINK3_MK
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 6a2aae99598..5b34fbedebc 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/03 06:35:26 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/04/06 06:22:04 reed Exp $
#
DISTNAME= librsvg-2.14.3
@@ -32,7 +32,7 @@ GTK2_LOADERS= yes
.include "../../devel/libgsf/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-BUILDLINK_DEPENDS.libcroco+= libcroco>=0.6.1
+BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1
.include "../../textproc/libcroco/buildlink3.mk"
.include "../../x11/gtk2/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk
index 1d4264237b1..477d3a1bd47 100644
--- a/graphics/librsvg2/buildlink3.mk
+++ b/graphics/librsvg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/03/06 00:18:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsvg2}
BUILDLINK_PACKAGES+= librsvg2
.if !empty(LIBRSVG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1
-BUILDLINK_RECOMMENDED.librsvg2+= librsvg2>=2.14.1
+BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6nb1
+BUILDLINK_ABI_DEPENDS.librsvg2+= librsvg2>=2.14.1
BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2
.endif # LIBRSVG2_BUILDLINK3_MK
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index b5ba6e5a84b..1f1ad609367 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:14:55 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBUNGIF_BUILDLINK3_MK:= ${LIBUNGIF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibungif}
BUILDLINK_PACKAGES+= libungif
.if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libungif+= libungif>=4.1.0
-BUILDLINK_RECOMMENDED.libungif+= libungif>=4.1.3nb1
+BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0
+BUILDLINK_ABI_DEPENDS.libungif+= libungif>=4.1.3nb1
BUILDLINK_PKGSRCDIR.libungif?= ../../graphics/libungif
.endif # LIBUNGIF_BUILDLINK3_MK
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index c13c302216f..f1e20c8f554 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBVIDEOGFX_BUILDLINK3_MK:= ${LIBVIDEOGFX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibvideogfx}
BUILDLINK_PACKAGES+= libvideogfx
.if !empty(LIBVIDEOGFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvideogfx+= libvideogfx>=1.0.3
-BUILDLINK_RECOMMENDED.libvideogfx+= libvideogfx>=1.0.3nb2
+BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3
+BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb2
BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx
.endif # LIBVIDEOGFX_BUILDLINK3_MK
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index ec768dbb067..844e90a79d7 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:04 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBWMF_BUILDLINK3_MK:= ${LIBWMF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwmf}
BUILDLINK_PACKAGES+= libwmf
.if !empty(LIBWMF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwmf+= libwmf>=0.2.8nb2
-BUILDLINK_RECOMMENDED.libwmf+= libwmf>=0.2.8.4nb2
+BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8nb2
+BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb2
BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf
.endif # LIBWMF_BUILDLINK3_MK
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index 4ff15e2ef6f..c09e7442cff 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MNG_BUILDLINK3_MK:= ${MNG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmng}
BUILDLINK_PACKAGES+= mng
.if !empty(MNG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mng+= mng>=1.0.0
-BUILDLINK_RECOMMENDED.mng+= mng>=1.0.9nb1
+BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0
+BUILDLINK_ABI_DEPENDS.mng+= mng>=1.0.9nb1
BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng
.endif # MNG_BUILDLINK3_MK
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index 13543d78a8f..aae224ce1fd 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NETPBM_BUILDLINK3_MK:= ${NETPBM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnetpbm}
BUILDLINK_PACKAGES+= netpbm
.if !empty(NETPBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netpbm+= netpbm>=10.11.6
-BUILDLINK_RECOMMENDED.netpbm+= netpbm>=10.31nb2
+BUILDLINK_API_DEPENDS.netpbm+= netpbm>=10.11.6
+BUILDLINK_ABI_DEPENDS.netpbm+= netpbm>=10.31nb2
BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm
.endif # NETPBM_BUILDLINK3_MK
diff --git a/graphics/openexr/buildlink3.mk b/graphics/openexr/buildlink3.mk
index 187c4a71aa8..2496ccf2e6e 100644
--- a/graphics/openexr/buildlink3.mk
+++ b/graphics/openexr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENEXR_BUILDLINK3_MK:= ${OPENEXR_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenexr}
BUILDLINK_PACKAGES+= openexr
.if !empty(OPENEXR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openexr+= openexr>=1.2.1
-BUILDLINK_RECOMMENDED.openexr?= openexr>=1.2.2nb1
+BUILDLINK_API_DEPENDS.openexr+= openexr>=1.2.1
+BUILDLINK_ABI_DEPENDS.openexr?= openexr>=1.2.2nb1
BUILDLINK_PKGSRCDIR.openexr?= ../../graphics/openexr
.endif # OPENEXR_BUILDLINK3_MK
diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
index bba933f46d6..1e9341640bf 100644
--- a/graphics/optipng/Makefile
+++ b/graphics/optipng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/01/19 11:18:41 adam Exp $
+# $NetBSD: Makefile,v 1.6 2006/04/06 06:22:05 reed Exp $
DISTNAME= optipng-0.5
CATEGORIES= graphics
@@ -8,7 +8,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.cs.toronto.edu/~cosmin/pngtech/optipng/
COMMENT= Advanced PNG Optimizer
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.2
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.2
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index a0517ac5919..22c7e7dde1c 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:05 reed Exp $
DISTNAME= GD-2.30
PKGNAME= p5-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT= Perl5 interface to gd graphics library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-BUILDLINK_DEPENDS.gd+= gd>=2.0.28
+BUILDLINK_API_DEPENDS.gd+= gd>=2.0.28
PERL5_PACKLIST= auto/GD/.packlist
PERL5_OPTIONS+= threads
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 017b18b3e4a..bc0eaa42f48 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= Image-Imlib2-1.04
@@ -13,7 +13,7 @@ HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/
COMMENT= Interface to the Imlib2 image library
# versions before that contained a broken imlib2-config
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
PERL5_MODULE_TYPE= Module::Build
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index ee4441fbcfa..b7bad0588ba 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/04 22:30:50 ghen Exp $
+# $NetBSD: Makefile,v 1.51 2006/04/06 06:22:05 reed Exp $
.include "../../graphics/ImageMagick/Makefile.common"
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
post-configure: perl5-configure
-BUILDLINK_DEPENDS.ImageMagick+= ImageMagick>=${DISTVERSION}
+BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=${DISTVERSION}
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../lang/perl5/module.mk"
diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk
index 0ddd518e8ba..638ff5f40ba 100644
--- a/graphics/plotutils-nox11/buildlink3.mk
+++ b/graphics/plotutils-nox11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/17 01:14:19 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLOTUTILS_NOX11_BUILDLINK3_MK:= ${PLOTUTILS_NOX11_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils-nox11}
BUILDLINK_PACKAGES+= plotutils-nox11
.if !empty(PLOTUTILS_NOX11_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1
+BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1
BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11
.endif # PLOTUTILS_NOX11_BUILDLINK3_MK
diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk
index 2835a1602e2..c751dc18c9b 100644
--- a/graphics/plotutils/buildlink3.mk
+++ b/graphics/plotutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PLOTUTILS_BUILDLINK3_MK:= ${PLOTUTILS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nplotutils}
BUILDLINK_PACKAGES+= plotutils
.if !empty(PLOTUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plotutils+= plotutils>=2.4.1nb2
-BUILDLINK_RECOMMENDED.plotutils+= plotutils>=2.4.1nb4
+BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2
+BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.4.1nb4
BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils
.endif # PLOTUTILS_BUILDLINK3_MK
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index ae9bf466763..79df10592d5 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/10/03 00:14:57 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npng}
BUILDLINK_PACKAGES+= png
.if !empty(PNG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.png+= png>=1.2.4
-BUILDLINK_RECOMMENDED.png?= png>=1.2.6nb1
+BUILDLINK_API_DEPENDS.png+= png>=1.2.4
+BUILDLINK_ABI_DEPENDS.png?= png>=1.2.6nb1
BUILDLINK_PKGSRCDIR.png?= ../../graphics/png
.endif # PNG_BUILDLINK3_MK
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index dda392beec2..a1812b8c79f 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:38 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:05 reed Exp $
DISTNAME= povray-3.6.1
PKGREVISION= 3
@@ -13,7 +13,7 @@ COMMENT= Persistence of Vision Ray Tracer
LICENSE= povray-license
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index 6c59127415f..2d61dfc4723 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyimaging}
BUILDLINK_PACKAGES+= pyimaging
.if !empty(PY_IMAGING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4
-BUILDLINK_RECOMMENDED.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1
+BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4
+BUILDLINK_ABI_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1
BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging
.endif # PY_IMAGING_BUILDLINK3_MK
diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile
index b24d51f1280..37c495d08b3 100644
--- a/graphics/py-imagingtk/Makefile
+++ b/graphics/py-imagingtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= Imaging-1.1.5
@@ -13,7 +13,7 @@ COMMENT= Tk support for the Python Imaging Library (PIL)
DIST_SUBDIR= python
PYDISTUTILSPKG= yes
-BUILDLINK_DEPENDS.python20+= python20>=2.0.1nb4
+BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb4
PY_PATCHPLIST= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index e52c05cc45f..4765f60b881 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:05 reed Exp $
DISTNAME= imlib2-ruby-${VER}
PKGNAME= ${RUBY_PKGPREFIX}-imlib2-${VER}
@@ -20,7 +20,7 @@ USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
-BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../lang/ruby/modules.mk"
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index c718e3bec78..e372deb77bc 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SANE_BACKENDS_BUILDLINK3_MK:= ${SANE_BACKENDS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsane-backends}
BUILDLINK_PACKAGES+= sane-backends
.if !empty(SANE_BACKENDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sane-backends+= sane-backends>=1.0.3
-BUILDLINK_RECOMMENDED.sane-backends+= sane-backends>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sane-backends+= sane-backends>=1.0.3
+BUILDLINK_ABI_DEPENDS.sane-backends+= sane-backends>=1.0.17nb1
BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends
.endif # SANE_BACKENDS_BUILDLINK3_MK
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 846dfdae534..c644fd32872 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/06 00:18:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/04/06 06:22:05 reed Exp $
.include "../../graphics/sane-backends/Makefile.common"
@@ -8,7 +8,7 @@ SANE_MICRO= 13
COMMENT= Frontends for access to scanners, digitals camera, frame grabbers etc
-BUILDLINK_DEPENDS.sane+= sane-backends>=${SANE_VERSION}
+BUILDLINK_API_DEPENDS.sane+= sane-backends>=${SANE_VERSION}
USE_X11BASE= YES
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index 5e06f799ae3..448a5037b90 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SIMAGE_BUILDLINK3_MK:= ${SIMAGE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsimage}
BUILDLINK_PACKAGES+= simage
.if !empty(SIMAGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.simage+= simage>=1.6.1
-BUILDLINK_RECOMMENDED.simage+= simage>=1.6.1nb2
+BUILDLINK_API_DEPENDS.simage+= simage>=1.6.1
+BUILDLINK_ABI_DEPENDS.simage+= simage>=1.6.1nb2
BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage
.endif # SIMAGE_BUILDLINK3_MK
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index fd3842fa64d..f511d4d8fc0 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/05/12 12:53:21 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:05 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TIFF_BUILDLINK3_MK:= ${TIFF_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntiff}
BUILDLINK_PACKAGES+= tiff
.if !empty(TIFF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tiff+= tiff>=3.6.1
-BUILDLINK_RECOMMENDED.tiff+= tiff>=3.7.2nb1
+BUILDLINK_API_DEPENDS.tiff+= tiff>=3.6.1
+BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.7.2nb1
BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff
.endif # TIFF_BUILDLINK3_MK
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index cdb686abe01..99cdd3f1b46 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/07 18:56:46 minskim Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/06 06:22:05 reed Exp $
#
DISTNAME= tuxpaint-0.9.14
@@ -15,9 +15,9 @@ USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
MANCOMPRESSED= YES
-BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6
-BUILDLINK_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7
-BUILDLINK_DEPENDS.SDL_image+= SDL_image>=1.2.4
+BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6
+BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7
+BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.4
CONFLICTS+= tuxpaint-stamps<2003.12.23
diff --git a/graphics/urt/buildlink3.mk b/graphics/urt/buildlink3.mk
index 7bcfdbf60f0..a6523162aa5 100644
--- a/graphics/urt/buildlink3.mk
+++ b/graphics/urt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
URT_BUILDLINK3_MK:= ${URT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nurt}
BUILDLINK_PACKAGES+= urt
.if !empty(URT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.urt+= urt>=3.1b1nb5
-BUILDLINK_RECOMMENDED.urt?= urt>=3.1b1nb6
+BUILDLINK_API_DEPENDS.urt+= urt>=3.1b1nb5
+BUILDLINK_ABI_DEPENDS.urt?= urt>=3.1b1nb6
BUILDLINK_PKGSRCDIR.urt?= ../../graphics/urt
.endif # URT_BUILDLINK3_MK
diff --git a/graphics/wxsvg/buildlink3.mk b/graphics/wxsvg/buildlink3.mk
index cc824494531..2e4b3545122 100644
--- a/graphics/wxsvg/buildlink3.mk
+++ b/graphics/wxsvg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:40 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
WXSVG_BUILDLINK3_MK:= ${WXSVG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwxsvg}
BUILDLINK_PACKAGES+= wxsvg
.if !empty(WXSVG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxsvg+= wxsvg>=1.0beta5
-BUILDLINK_RECOMMENDED.wxsvg?= wxsvg>=1.0beta5nb1
+BUILDLINK_API_DEPENDS.wxsvg+= wxsvg>=1.0beta5
+BUILDLINK_ABI_DEPENDS.wxsvg?= wxsvg>=1.0beta5nb1
BUILDLINK_PKGSRCDIR.wxsvg?= ../../graphics/wxsvg
.endif # WXSVG_BUILDLINK3_MK
diff --git a/graphics/xfce4-artwork/buildlink3.mk b/graphics/xfce4-artwork/buildlink3.mk
index 7bdcf595930..2fe29518382 100644
--- a/graphics/xfce4-artwork/buildlink3.mk
+++ b/graphics/xfce4-artwork/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ARTWORK_BUILDLINK3_MK:= ${XFCE4_ARTWORK_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-artwork}
BUILDLINK_PACKAGES+= xfce4-artwork
.if !empty(XFCE4_ARTWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-artwork+= xfce4-artwork>=0.0.4nb5
-BUILDLINK_RECOMMENDED.xfce4-artwork?= xfce4-artwork>=0.0.4nb7
+BUILDLINK_API_DEPENDS.xfce4-artwork+= xfce4-artwork>=0.0.4nb5
+BUILDLINK_ABI_DEPENDS.xfce4-artwork?= xfce4-artwork>=0.0.4nb7
BUILDLINK_PKGSRCDIR.xfce4-artwork?= ../../graphics/xfce4-artwork
.endif # XFCE4_ARTWORK_BUILDLINK3_MK
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index 91fdd2d6fea..2fa9d4782a1 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICON_THEME_BUILDLINK3_MK:= ${XFCE4_ICON_THEME_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-icon-theme}
BUILDLINK_PACKAGES+= xfce4-icon-theme
.if !empty(XFCE4_ICON_THEME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-icon-theme?= xfce4-icon-theme>=4.2.3nb1
+BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?= xfce4-icon-theme>=4.2.3nb1
BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme
.endif # XFCE4_ICON_THEME_BUILDLINK3_MK
diff --git a/graphics/xfce4-iconbox/buildlink3.mk b/graphics/xfce4-iconbox/buildlink3.mk
index a951c5de024..e4718d7f195 100644
--- a/graphics/xfce4-iconbox/buildlink3.mk
+++ b/graphics/xfce4-iconbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-iconbox}
BUILDLINK_PACKAGES+= xfce4-iconbox
.if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-iconbox?= xfce4-iconbox>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-iconbox?= xfce4-iconbox>=4.2.3nb2
BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox
.endif # XFCE4_ICONBOX_BUILDLINK3_MK
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index df57dcbdc5c..13822f3778f 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2006/04/06 06:22:06 reed Exp $
DISTNAME= xfig.3.2.5-alpha5.full
PKGNAME= xfig-3.2.5alpha5
@@ -13,7 +13,7 @@ COMMENT= CAD-like 2D drawing tool, good for colorful scale drawings & ISOs
DEPENDS+= transfig>=3.2.4:../../print/transfig
# if we're using Xaw3d, then we need 1.5E or newer since using that
# version means we need a patch, which is currently used unconditionally
-BUILDLINK_DEPENDS.Xaw3d+= Xaw3d>=1.5E
+BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5E
WRKSRC= ${WRKDIR}/xfig.3.2.5-alpha5
USE_IMAKE= YES
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index fb8b5229229..048256c1903 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/02/05 23:09:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:22:06 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxpm}
BUILDLINK_PACKAGES+= xpm
.if !empty(XPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xpm+= xpm>=3.4k
-BUILDLINK_RECOMMENDED.xpm?= xpm>=3.4knb6
+BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k
+BUILDLINK_ABI_DEPENDS.xpm?= xpm>=3.4knb6
BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm
.endif # XPM_BUILDLINK3_MK
diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk
index eceebda0e4d..286b0968344 100644
--- a/graphics/xpm/builtin.mk
+++ b/graphics/xpm/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:18 jlam Exp $
+# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:22:06 reed Exp $
BUILTIN_PKG:= xpm
@@ -63,7 +63,7 @@ USE_BUILTIN.xpm= ${IS_BUILTIN.xpm}
. if defined(BUILTIN_PKG.xpm) && \
!empty(IS_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm= yes
-. for _dep_ in ${BUILDLINK_DEPENDS.xpm}
+. for _dep_ in ${BUILDLINK_API_DEPENDS.xpm}
. if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
USE_BUILTIN.xpm!= \
if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xpm:Q}; then \