Index: ./archivers/bzip2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/bzip2/buildlink3.mk,v
retrieving revision 1.17
diff -u -r1.17 buildlink3.mk
--- ./archivers/bzip2/buildlink3.mk	26 May 2005 15:03:11 -0000	1.17
+++ ./archivers/bzip2/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	bzip2
 
 .if !empty(BZIP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bzip2+=	bzip2>=1.0.1
+BUILDLINK_API_DEPENDS.bzip2+=	bzip2>=1.0.1
 BUILDLINK_PKGSRCDIR.bzip2?=	../../archivers/bzip2
-BUILDLINK_RECOMMENDED.bzip2+=	bzip2>=1.0.3
+BUILDLINK_ABI_DEPENDS.bzip2+=	bzip2>=1.0.3
 .endif	# BZIP2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
Index: ./archivers/bzip2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/bzip2/builtin.mk,v
retrieving revision 1.4
diff -u -r1.4 builtin.mk
--- ./archivers/bzip2/builtin.mk	27 Jun 2005 18:17:57 -0000	1.4
+++ ./archivers/bzip2/builtin.mk	4 Apr 2006 06:26:50 -0000
@@ -32,7 +32,7 @@
 .    if defined(BUILTIN_PKG.bzip2) && \
         !empty(IS_BUILTIN.bzip2:M[yY][eE][sS])
 USE_BUILTIN.bzip2=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.bzip2}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.bzip2}
 .        if !empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
 USE_BUILTIN.bzip2!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bzip2:Q}; then	\
Index: ./archivers/file-roller/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/file-roller/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- ./archivers/file-roller/Makefile	21 Mar 2006 06:00:43 -0000	1.55
+++ ./archivers/file-roller/Makefile	4 Apr 2006 06:26:50 -0000
@@ -24,9 +24,9 @@
 
 GCONF2_SCHEMAS=		file-roller.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.4.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./archivers/gsharutils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/gsharutils/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- ./archivers/gsharutils/Makefile	30 Mar 2006 03:44:41 -0000	1.37
+++ ./archivers/gsharutils/Makefile	4 Apr 2006 06:26:50 -0000
@@ -35,7 +35,7 @@
 # XXX ...but don't do this on Linux, where glibc-internalized gettext
 # always uses the non-prefixed symbols.
 #
-BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.11
+BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.11
 CPPFLAGS+=		-D_nl_default_dirname=libintl_nl_default_dirname
 .endif
 
Index: ./archivers/libcomprex/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/libcomprex/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./archivers/libcomprex/buildlink3.mk	5 Feb 2006 23:08:04 -0000	1.6
+++ ./archivers/libcomprex/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcomprex
 
 .if !empty(LIBCOMPREX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcomprex+=		libcomprex>=0.3.2
-BUILDLINK_RECOMMENDED.libcomprex+=	libcomprex>=0.3.3nb1
+BUILDLINK_API_DEPENDS.libcomprex+=		libcomprex>=0.3.2
+BUILDLINK_ABI_DEPENDS.libcomprex+=	libcomprex>=0.3.3nb1
 BUILDLINK_PKGSRCDIR.libcomprex?=	../../archivers/libcomprex
 .endif	# LIBCOMPREX_BUILDLINK3_MK
 
Index: ./archivers/liblzo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/liblzo/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./archivers/liblzo/buildlink3.mk	3 Oct 2004 00:13:04 -0000	1.4
+++ ./archivers/liblzo/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	liblzo
 
 .if !empty(LIBLZO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liblzo+=	liblzo>=1.08
+BUILDLINK_API_DEPENDS.liblzo+=	liblzo>=1.08
 BUILDLINK_PKGSRCDIR.liblzo?=	../../archivers/liblzo
-BUILDLINK_RECOMMENDED.liblzo+=	liblzo>=1.08nb1
+BUILDLINK_ABI_DEPENDS.liblzo+=	liblzo>=1.08nb1
 .endif	# LIBLZO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
Index: ./archivers/libzip/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/libzip/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./archivers/libzip/buildlink3.mk	22 Jun 2005 21:11:39 -0000	1.1.1.1
+++ ./archivers/libzip/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libzip
 
 .if !empty(LIBZIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libzip+=	libzip>=0.6
+BUILDLINK_API_DEPENDS.libzip+=	libzip>=0.6
 BUILDLINK_PKGSRCDIR.libzip?=	../../archivers/libzip
 .endif	# LIBZIP_BUILDLINK3_MK
 
Index: ./archivers/lzo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/lzo/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./archivers/lzo/buildlink3.mk	14 Jul 2005 20:05:17 -0000	1.2
+++ ./archivers/lzo/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	lzo
 
 .if !empty(LZO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lzo+=		lzo>=2.01
+BUILDLINK_API_DEPENDS.lzo+=		lzo>=2.01
 BUILDLINK_PKGSRCDIR.lzo?=	../../archivers/lzo
 .endif	# LZO_BUILDLINK3_MK
 
Index: ./archivers/szip/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/szip/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./archivers/szip/buildlink3.mk	24 Feb 2005 16:20:25 -0000	1.2
+++ ./archivers/szip/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	szip
 
 .if !empty(SZIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.szip+=	szip>=2.0
+BUILDLINK_API_DEPENDS.szip+=	szip>=2.0
 BUILDLINK_PKGSRCDIR.szip?=	../../archivers/szip
 .endif	# SZIP_BUILDLINK3_MK
 
Index: ./archivers/ucl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/ucl/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./archivers/ucl/buildlink3.mk	15 Feb 2006 16:58:21 -0000	1.1.1.1
+++ ./archivers/ucl/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	ucl
 
 .if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ucl+=	ucl>=1.03
+BUILDLINK_API_DEPENDS.ucl+=	ucl>=1.03
 BUILDLINK_PKGSRCDIR.ucl?=	../../archivers/ucl
 .endif	# UCL_BUILDLINK3_MK
 
Index: ./archivers/zziplib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/archivers/zziplib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./archivers/zziplib/buildlink3.mk	18 Mar 2004 09:12:08 -0000	1.2
+++ ./archivers/zziplib/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	zziplib
 
 .if !empty(ZZIPLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zziplib+=	zziplib>=0.10.82
+BUILDLINK_API_DEPENDS.zziplib+=	zziplib>=0.10.82
 BUILDLINK_PKGSRCDIR.zziplib?=	../../archivers/zziplib
 .endif	# ZZIPLIB_BUILDLINK3_MK
 
Index: ./audio/SDL-nas/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/SDL-nas/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./audio/SDL-nas/Makefile	5 Feb 2006 23:08:05 -0000	1.12
+++ ./audio/SDL-nas/Makefile	4 Apr 2006 06:26:50 -0000
@@ -20,7 +20,7 @@
 	cd ${WRKSRC}/src/audio/nas && ${SHLIBTOOL} --mode=install \
 		${INSTALL_DATA} libaudio_nas.la ${PREFIX}/lib
 
-BUILDLINK_DEPENDS.SDL+=	SDL>=1.2.5nb6
+BUILDLINK_API_DEPENDS.SDL+=	SDL>=1.2.5nb6
 
 .include "../../audio/nas/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
Index: ./audio/SDL_mixer/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/SDL_mixer/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./audio/SDL_mixer/buildlink3.mk	5 Feb 2006 23:08:05 -0000	1.11
+++ ./audio/SDL_mixer/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
-BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.6nb4
+BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
+BUILDLINK_ABI_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6nb4
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 .endif	# SDL_MIXER_BUILDLINK3_MK
Index: ./audio/SDL_sound/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/SDL_sound/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/SDL_sound/buildlink3.mk	5 Feb 2006 23:08:05 -0000	1.6
+++ ./audio/SDL_sound/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL_sound
 
 .if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
-BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb4
+BUILDLINK_API_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
+BUILDLINK_ABI_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1nb4
 BUILDLINK_PKGSRCDIR.SDL_sound?=	../../audio/SDL_sound
 .endif	# SDL_SOUND_BUILDLINK3_MK
 
Index: ./audio/amarok/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/amarok/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./audio/amarok/Makefile	9 Mar 2006 21:04:39 -0000	1.31
+++ ./audio/amarok/Makefile	4 Apr 2006 06:26:50 -0000
@@ -23,9 +23,9 @@
 
 LIBS+=			${LIBOSSAUDIO}
 
-BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.3.0
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.3.0
-BUILDLINK_DEPENDS.taglib+=	taglib>=1.4
+BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.3.0
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.3.0
+BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.4
 
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
Index: ./audio/arts/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/arts/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./audio/arts/buildlink3.mk	9 Mar 2006 21:04:39 -0000	1.14
+++ ./audio/arts/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	arts
 
 .if !empty(ARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.arts+=	arts>=1.1.4nb1
-BUILDLINK_RECOMMENDED.arts+=	arts>=1.5.1nb1
+BUILDLINK_API_DEPENDS.arts+=	arts>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.arts+=	arts>=1.5.1nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
Index: ./audio/bmp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/bmp/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/bmp/buildlink3.mk	5 Feb 2006 23:08:05 -0000	1.3
+++ ./audio/bmp/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	bmp
 
 .if !empty(BMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
-BUILDLINK_RECOMMENDED.bmp?=	bmp>=0.9.7nb4
+BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
+BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7nb4
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Input$$/ \
Index: ./audio/cddb-bundle/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cddb-bundle/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./audio/cddb-bundle/buildlink3.mk	5 Feb 2006 23:08:06 -0000	1.2
+++ ./audio/cddb-bundle/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cddb-bundle
 
 .if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
-BUILDLINK_RECOMMENDED.cddb-bundle?=	cddb-bundle>=0.2nb1
+BUILDLINK_API_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
+BUILDLINK_ABI_DEPENDS.cddb-bundle?=	cddb-bundle>=0.2nb1
 BUILDLINK_PKGSRCDIR.cddb-bundle?=	../../audio/cddb-bundle
 .endif	# CDDB_BUNDLE_BUILDLINK3_MK
 
Index: ./audio/cdparanoia/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cdparanoia/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/cdparanoia/buildlink3.mk	7 Mar 2006 06:30:55 -0000	1.5
+++ ./audio/cdparanoia/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cdparanoia
 
 .if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdparanoia+=		cdparanoia>=3.0
-BUILDLINK_RECOMMENDED.cdparanoia?=	cdparanoia>=3.0.9.8nb5
+BUILDLINK_API_DEPENDS.cdparanoia+=		cdparanoia>=3.0
+BUILDLINK_ABI_DEPENDS.cdparanoia?=	cdparanoia>=3.0.9.8nb5
 BUILDLINK_PKGSRCDIR.cdparanoia?=	../../audio/cdparanoia
 .endif	# CDPARANOIA_BUILDLINK3_MK
 
Index: ./audio/cdplayer/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cdplayer/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/cdplayer/buildlink3.mk	5 Feb 2006 23:08:06 -0000	1.3
+++ ./audio/cdplayer/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cdplayer
 
 .if !empty(CDPLAYER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdplayer+=	cdplayer>=0.4.2
-BUILDLINK_RECOMMENDED.cdplayer?=	cdplayer>=0.4.2nb3
+BUILDLINK_API_DEPENDS.cdplayer+=	cdplayer>=0.4.2
+BUILDLINK_ABI_DEPENDS.cdplayer?=	cdplayer>=0.4.2nb3
 BUILDLINK_PKGSRCDIR.cdplayer?=	../../audio/cdplayer
 .endif	# CDPLAYER_BUILDLINK3_MK
 
Index: ./audio/esound/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/esound/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./audio/esound/buildlink3.mk	3 Oct 2004 00:13:05 -0000	1.7
+++ ./audio/esound/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	esound
 
 .if !empty(ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.esound+=	esound>=0.2.18
-BUILDLINK_RECOMMENDED.esound+=	esound>=0.2.35nb1
+BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.18
+BUILDLINK_ABI_DEPENDS.esound+=	esound>=0.2.35nb1
 BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 .endif	# ESOUND_BUILDLINK3_MK
 
Index: ./audio/faac/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/faac/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./audio/faac/buildlink3.mk	3 Oct 2004 00:13:05 -0000	1.2
+++ ./audio/faac/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	faac
 
 .if !empty(FAAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faac+=	faac>=1.24
-BUILDLINK_RECOMMENDED.faac+=	faac>=1.24nb1
+BUILDLINK_API_DEPENDS.faac+=	faac>=1.24
+BUILDLINK_ABI_DEPENDS.faac+=	faac>=1.24nb1
 BUILDLINK_PKGSRCDIR.faac?=	../../audio/faac
 .endif	# FAAC_BUILDLINK3_MK
 
Index: ./audio/faad2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/faad2/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./audio/faad2/buildlink3.mk	5 Feb 2006 23:08:06 -0000	1.7
+++ ./audio/faad2/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	faad2
 
 .if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faad2+=	faad2>=2.0nb3
-BUILDLINK_RECOMMENDED.faad2?=	faad2>=2.0nb5
+BUILDLINK_API_DEPENDS.faad2+=	faad2>=2.0nb3
+BUILDLINK_ABI_DEPENDS.faad2?=	faad2>=2.0nb5
 BUILDLINK_PKGSRCDIR.faad2?=	../../audio/faad2
 BUILDLINK_INCDIRS.faad2?=	include/faad2
 .endif	# FAAD2_BUILDLINK3_MK
Index: ./audio/flac/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/flac/buildlink3.mk	5 Feb 2006 23:08:08 -0000	1.6
+++ ./audio/flac/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	flac
 
 .if !empty(FLAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flac+=	flac>=1.1.0nb1
-BUILDLINK_RECOMMENDED.flac+=	flac>=1.1.2nb1
+BUILDLINK_API_DEPENDS.flac+=	flac>=1.1.0nb1
+BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
 .endif	# FLAC_BUILDLINK3_MK
 
Index: ./audio/fluidsynth/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/fluidsynth/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./audio/fluidsynth/buildlink3.mk	19 Feb 2006 18:26:43 -0000	1.2
+++ ./audio/fluidsynth/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	fluidsynth
 
 .if !empty(FLUIDSYNTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
+BUILDLINK_API_DEPENDS.fluidsynth+=		fluidsynth>=1.0.5
 BUILDLINK_PKGSRCDIR.fluidsynth?=	../../audio/fluidsynth
 .endif	# FLUIDSYNTH_BUILDLINK3_MK
 
Index: ./audio/gkrellm-xmms/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gkrellm-xmms/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./audio/gkrellm-xmms/Makefile	28 Mar 2006 16:24:21 -0000	1.24
+++ ./audio/gkrellm-xmms/Makefile	4 Apr 2006 06:26:50 -0000
@@ -15,7 +15,7 @@
 USE_PKGLOCALEDIR=	YES
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm>=2.2.0
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.2.0
 
 WRKSRC=		${WRKDIR}/gkrellmms
 MAKE_ENV+=	LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
Index: ./audio/gnome-speech/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gnome-speech/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./audio/gnome-speech/buildlink3.mk	5 Feb 2006 23:08:08 -0000	1.8
+++ ./audio/gnome-speech/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-speech
 
 .if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
-BUILDLINK_RECOMMENDED.gnome-speech+=	gnome-speech>=0.3.9nb2
+BUILDLINK_API_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
+BUILDLINK_ABI_DEPENDS.gnome-speech+=	gnome-speech>=0.3.9nb2
 BUILDLINK_PKGSRCDIR.gnome-speech?=	../../audio/gnome-speech
 .endif	# GNOME_SPEECH_BUILDLINK3_MK
 
Index: ./audio/goom/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/goom/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./audio/goom/buildlink3.mk	20 Feb 2005 14:59:24 -0000	1.1.1.1
+++ ./audio/goom/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	goom
 
 .if !empty(GOOM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goom+=	goom>=2004.0
+BUILDLINK_API_DEPENDS.goom+=	goom>=2004.0
 BUILDLINK_PKGSRCDIR.goom?=	../../audio/goom
 .endif	# GOOM_BUILDLINK3_MK
 
Index: ./audio/gsm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gsm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/gsm/buildlink3.mk	3 Oct 2004 00:13:06 -0000	1.3
+++ ./audio/gsm/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gsm
 
 .if !empty(GSM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsm+=		gsm>=1.0.10
-BUILDLINK_RECOMMENDED.gsm+=	gsm>=1.0.10nb1
+BUILDLINK_API_DEPENDS.gsm+=		gsm>=1.0.10
+BUILDLINK_ABI_DEPENDS.gsm+=	gsm>=1.0.10nb1
 BUILDLINK_PKGSRCDIR.gsm?=	../../audio/gsm
 .endif	# GSM_BUILDLINK3_MK
 
Index: ./audio/gst-plugins0.8-artsd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gst-plugins0.8-artsd/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/gst-plugins0.8-artsd/buildlink3.mk	5 Feb 2006 23:08:09 -0000	1.3
+++ ./audio/gst-plugins0.8-artsd/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.8-artsd
 
 .if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-artsd?=	../../audio/gst-plugins0.8-artsd
 .endif	# GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK
 
Index: ./audio/gst-plugins0.8-esound/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gst-plugins0.8-esound/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/gst-plugins0.8-esound/buildlink3.mk	5 Feb 2006 23:08:09 -0000	1.3
+++ ./audio/gst-plugins0.8-esound/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.8-esound
 
 .if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-esound?=	../../audio/gst-plugins0.8-esound
 .endif	# GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK
 
Index: ./audio/gst-plugins0.8-mad/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gst-plugins0.8-mad/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/gst-plugins0.8-mad/buildlink3.mk	5 Feb 2006 23:08:09 -0000	1.3
+++ ./audio/gst-plugins0.8-mad/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.8-mad
 
 .if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-mad?=	../../audio/gst-plugins0.8-mad
 .endif	# GST_PLUGINS0.8_MAD_BUILDLINK3_MK
 
Index: ./audio/gtkpod/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/gtkpod/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./audio/gtkpod/Makefile	25 Mar 2006 14:25:01 -0000	1.9
+++ ./audio/gtkpod/Makefile	4 Apr 2006 06:26:50 -0000
@@ -20,7 +20,7 @@
 
 REPLACE_PERL+=		scripts/mab2vcard
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.4.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
 
 .include "options.mk"
 
Index: ./audio/id3lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/id3lib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/id3lib/buildlink3.mk	3 Oct 2004 00:13:06 -0000	1.5
+++ ./audio/id3lib/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	id3lib
 
 .if !empty(ID3LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.id3lib+=	id3lib>=3.8.3
-BUILDLINK_RECOMMENDED.id3lib+=	id3lib>=3.8.3nb1
+BUILDLINK_API_DEPENDS.id3lib+=	id3lib>=3.8.3
+BUILDLINK_ABI_DEPENDS.id3lib+=	id3lib>=3.8.3nb1
 BUILDLINK_PKGSRCDIR.id3lib?=	../../audio/id3lib
 .endif	# ID3LIB_BUILDLINK3_MK
 
Index: ./audio/ladspa/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/ladspa/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/ladspa/buildlink3.mk	5 Feb 2006 23:08:10 -0000	1.3
+++ ./audio/ladspa/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -14,8 +14,8 @@
 
 .if !empty(LADSPA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			ladspa
-BUILDLINK_DEPENDS.ladspa+=		ladspa>=1.12
-BUILDLINK_RECOMMENDED.ladspa?=		ladspa>=1.12nb1
+BUILDLINK_API_DEPENDS.ladspa+=		ladspa>=1.12
+BUILDLINK_ABI_DEPENDS.ladspa?=		ladspa>=1.12nb1
 BUILDLINK_PKGSRCDIR.ladspa?=		../../audio/ladspa
 
 .endif # LADSPA_BUILDLINK3_MK
Index: ./audio/lame/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/lame/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/lame/buildlink3.mk	5 Feb 2006 23:08:10 -0000	1.5
+++ ./audio/lame/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lame
 
 .if !empty(LAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lame+=	lame>=3.93.1nb2
-BUILDLINK_RECOMMENDED.lame+=	lame>=3.96.1nb4
+BUILDLINK_API_DEPENDS.lame+=	lame>=3.93.1nb2
+BUILDLINK_ABI_DEPENDS.lame+=	lame>=3.96.1nb4
 BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
 .endif	# LAME_BUILDLINK3_MK
 
Index: ./audio/liba52/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/liba52/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/liba52/buildlink3.mk	3 Oct 2004 00:13:06 -0000	1.3
+++ ./audio/liba52/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	liba52
 
 .if !empty(LIBA52_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liba52+=	liba52>=0.7.4
-BUILDLINK_RECOMMENDED.liba52+=	liba52>=0.7.4nb3
+BUILDLINK_API_DEPENDS.liba52+=	liba52>=0.7.4
+BUILDLINK_ABI_DEPENDS.liba52+=	liba52>=0.7.4nb3
 BUILDLINK_PKGSRCDIR.liba52?=	../../audio/liba52
 .endif	# LIBA52_BUILDLINK3_MK
 
Index: ./audio/libao/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libao/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./audio/libao/buildlink3.mk	5 Feb 2006 23:08:10 -0000	1.8
+++ ./audio/libao/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libao
 
 .if !empty(LIBAO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.4
-BUILDLINK_RECOMMENDED.libao+=	libao>=0.8.6nb3
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.4
+BUILDLINK_ABI_DEPENDS.libao+=	libao>=0.8.6nb3
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  if !defined(_LIBAO_BUILDING_PLUGIN)
Index: ./audio/libao-macosx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libao-macosx/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./audio/libao-macosx/Makefile	5 Feb 2006 23:08:10 -0000	1.4
+++ ./audio/libao-macosx/Makefile	4 Apr 2006 06:26:50 -0000
@@ -13,7 +13,7 @@
 BUILD_DIRS=		${WRKSRC}/src/plugins/macosx
 INSTALL_DIRS=		${WRKSRC}/src/plugins/macosx
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
Index: ./audio/libao-oss/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libao-oss/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./audio/libao-oss/Makefile	9 Mar 2006 21:04:40 -0000	1.5
+++ ./audio/libao-oss/Makefile	4 Apr 2006 06:26:50 -0000
@@ -20,7 +20,7 @@
 SUBST_SED.oss=		-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
 SUBST_SED.oss+=		-e 's|/dev/sound/dsp|${DEVOSSAUDIO}|g'
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
Index: ./audio/libao-sun/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libao-sun/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./audio/libao-sun/Makefile	5 Feb 2006 23:08:10 -0000	1.5
+++ ./audio/libao-sun/Makefile	4 Apr 2006 06:26:50 -0000
@@ -13,7 +13,7 @@
 BUILD_DIRS=		${WRKSRC}/src/plugins/sun
 INSTALL_DIRS=		${WRKSRC}/src/plugins/sun
 
-BUILDLINK_DEPENDS.libao+=	libao>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.6nb1
 
 _LIBAO_BUILDING_PLUGIN=	yes
 
Index: ./audio/libaudiofile/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libaudiofile/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./audio/libaudiofile/buildlink3.mk	3 Oct 2004 00:13:07 -0000	1.9
+++ ./audio/libaudiofile/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	audiofile
 
 .if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.audiofile+=	libaudiofile>=0.2.1
-BUILDLINK_RECOMMENDED.audiofile+=	libaudiofile>=0.2.6nb1
+BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.1
+BUILDLINK_ABI_DEPENDS.audiofile+=	libaudiofile>=0.2.6nb1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
 
Index: ./audio/libcdaudio/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libcdaudio/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libcdaudio/buildlink3.mk	16 May 2005 09:48:30 -0000	1.4
+++ ./audio/libcdaudio/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcdaudio
 
 .if !empty(LIBCDAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
-BUILDLINK_RECOMMENDED.libcdaudio+=	libcdaudio>=0.99.12nb1
+BUILDLINK_API_DEPENDS.libcdaudio+=		libcdaudio>=0.99.4nb1
+BUILDLINK_ABI_DEPENDS.libcdaudio+=	libcdaudio>=0.99.12nb1
 BUILDLINK_PKGSRCDIR.libcdaudio?=	../../audio/libcdaudio
 .endif	# LIBCDAUDIO_BUILDLINK3_MK
 
Index: ./audio/libcddb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libcddb/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./audio/libcddb/buildlink3.mk	29 Apr 2005 19:46:52 -0000	1.7
+++ ./audio/libcddb/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcddb
 
 .if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcddb+=	libcddb>=0.9.4
-BUILDLINK_RECOMMENDED.libcddb+=	libcddb>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libcddb+=	libcddb>=0.9.4
+BUILDLINK_ABI_DEPENDS.libcddb+=	libcddb>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.libcddb?=	../../audio/libcddb
 .endif	# LIBCDDB_BUILDLINK3_MK
 
Index: ./audio/libdca/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libdca/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./audio/libdca/buildlink3.mk	9 Dec 2005 17:21:02 -0000	1.1.1.1
+++ ./audio/libdca/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -14,7 +14,7 @@
 BUILDLINK_PACKAGES+=	libdca
 
 .if !empty(LIBDTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdca+=	libdca>=0.0.2
+BUILDLINK_API_DEPENDS.libdca+=	libdca>=0.0.2
 BUILDLINK_PKGSRCDIR.libdca?=	../../audio/libdca
 .endif	# LIBDTS_BUILDLINK3_MK
 
Index: ./audio/libhydrogen/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libhydrogen/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/libhydrogen/buildlink3.mk	5 Feb 2006 23:08:10 -0000	1.3
+++ ./audio/libhydrogen/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libhydrogen
 
 .if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
-BUILDLINK_RECOMMENDED.libhydrogen+=	libhydrogen>=0.8.0nb2
+BUILDLINK_API_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
+BUILDLINK_ABI_DEPENDS.libhydrogen+=	libhydrogen>=0.8.0nb2
 BUILDLINK_PKGSRCDIR.libhydrogen?=	../../audio/libhydrogen
 .endif	# LIBHYDROGEN_BUILDLINK3_MK
 
Index: ./audio/libid3tag/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libid3tag/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libid3tag/buildlink3.mk	3 Oct 2004 00:13:07 -0000	1.4
+++ ./audio/libid3tag/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libid3tag
 
 .if !empty(LIBID3TAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
-BUILDLINK_RECOMMENDED.libid3tag+=	libid3tag>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libid3tag+=	libid3tag>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libid3tag+=	libid3tag>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libid3tag?=	../../audio/libid3tag
 .endif	# LIBID3TAG_BUILDLINK3_MK
 
Index: ./audio/libmad/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmad/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/libmad/buildlink3.mk	3 Oct 2004 00:13:07 -0000	1.5
+++ ./audio/libmad/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmad
 
 .if !empty(LIBMAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmad+=	libmad>=0.15.0b
-BUILDLINK_RECOMMENDED.libmad+=	libmad>=0.15.1bnb1
+BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0b
+BUILDLINK_ABI_DEPENDS.libmad+=	libmad>=0.15.1bnb1
 BUILDLINK_PKGSRCDIR.libmad?=	../../audio/libmad
 .endif	# LIBMAD_BUILDLINK3_MK
 
Index: ./audio/libmikmod/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmikmod/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./audio/libmikmod/buildlink3.mk	5 Feb 2006 23:08:11 -0000	1.8
+++ ./audio/libmikmod/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	libmikmod
 
 .if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmikmod+=	libmikmod>=3.1.9
-BUILDLINK_RECOMMENDED.libmikmod+=	libmikmod>=3.1.11.1nb2
+BUILDLINK_API_DEPENDS.libmikmod+=	libmikmod>=3.1.9
+BUILDLINK_ABI_DEPENDS.libmikmod+=	libmikmod>=3.1.11.1nb2
 BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
 .endif	# LIBMIKMOD_BUILDLINK3_MK
 
Index: ./audio/libmodplug/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmodplug/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libmodplug/buildlink3.mk	3 Oct 2004 00:13:07 -0000	1.4
+++ ./audio/libmodplug/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmodplug
 
 .if !empty(LIBMODPLUG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmodplug+=		libmodplug>=0.7
-BUILDLINK_RECOMMENDED.libmodplug+=	libmodplug>=0.7nb1
+BUILDLINK_API_DEPENDS.libmodplug+=		libmodplug>=0.7
+BUILDLINK_ABI_DEPENDS.libmodplug+=	libmodplug>=0.7nb1
 BUILDLINK_PKGSRCDIR.libmodplug?=	../../audio/libmodplug
 .endif	# LIBMODPLUG_BUILDLINK3_MK
 
Index: ./audio/libmpd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmpd/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./audio/libmpd/buildlink3.mk	22 Nov 2005 19:26:08 -0000	1.1.1.1
+++ ./audio/libmpd/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmpd
 
 .if !empty(LIBMPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpd+=	libmpd>=0.01
+BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.01
 BUILDLINK_PKGSRCDIR.libmpd?=	../../audio/libmpd
 .endif	# LIBMPD_BUILDLINK3_MK
 
Index: ./audio/libmusepack/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libmusepack/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./audio/libmusepack/buildlink3.mk	4 Dec 2004 20:28:32 -0000	1.1.1.1
+++ ./audio/libmusepack/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmusepack
 
 .if !empty(LIBMUSEPACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmusepack+=		libmusepack>=1.0.3
+BUILDLINK_API_DEPENDS.libmusepack+=		libmusepack>=1.0.3
 BUILDLINK_PKGSRCDIR.libmusepack?=	../../audio/libmusepack
 .endif	# LIBMUSEPACK_BUILDLINK3_MK
 
Index: ./audio/libopendaap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libopendaap/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libopendaap/buildlink3.mk	19 Mar 2005 15:36:19 -0000	1.4
+++ ./audio/libopendaap/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libopendaap
 
 .if !empty(LIBOPENDAAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.2.1
-BUILDLINK_RECOMMENDED.libopendaap+=	libopendaap>=0.2.1nb1
+BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.2.1
+BUILDLINK_ABI_DEPENDS.libopendaap+=	libopendaap>=0.2.1nb1
 BUILDLINK_PKGSRCDIR.libopendaap?=	../../audio/libopendaap
 .endif	# LIBOPENDAAP_BUILDLINK3_MK
 
Index: ./audio/libsamplerate/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsamplerate/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./audio/libsamplerate/Makefile	4 Mar 2006 21:28:56 -0000	1.12
+++ ./audio/libsamplerate/Makefile	4 Apr 2006 06:26:50 -0000
@@ -16,7 +16,7 @@
 
 TEST_TARGET=	check
 
-BUILDLINK_DEPENDS.libsndfile+=	libsndfile>=1.0.2
+BUILDLINK_API_DEPENDS.libsndfile+=	libsndfile>=1.0.2
 
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
Index: ./audio/libsamplerate/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsamplerate/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/libsamplerate/buildlink3.mk	5 Feb 2006 23:08:11 -0000	1.5
+++ ./audio/libsamplerate/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsamplerate
 
 .if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
-BUILDLINK_RECOMMENDED.libsamplerate+=	libsamplerate>=0.1.2nb2
+BUILDLINK_API_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
+BUILDLINK_ABI_DEPENDS.libsamplerate+=	libsamplerate>=0.1.2nb2
 BUILDLINK_PKGSRCDIR.libsamplerate?=	../../audio/libsamplerate
 .endif	# LIBSAMPLERATE_BUILDLINK3_MK
 
Index: ./audio/libshout/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libshout/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/libshout/buildlink3.mk	28 Feb 2005 02:21:20 -0000	1.5
+++ ./audio/libshout/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libshout
 
 .if !empty(LIBSHOUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libshout+=	libshout>=2.0
-BUILDLINK_RECOMMENDED.libshout+=libshout>=2.0nb1
+BUILDLINK_API_DEPENDS.libshout+=	libshout>=2.0
+BUILDLINK_ABI_DEPENDS.libshout+=libshout>=2.0nb1
 BUILDLINK_PKGSRCDIR.libshout?=	../../audio/libshout
 .endif	# LIBSHOUT_BUILDLINK3_MK
 
Index: ./audio/libsidplay/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsidplay/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libsidplay/buildlink3.mk	5 Feb 2006 23:08:11 -0000	1.4
+++ ./audio/libsidplay/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsidplay
 
 .if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsidplay+=		libsidplay>=1.36.38
-BUILDLINK_RECOMMENDED.libsidplay+=	libsidplay>=1.36.59nb2
+BUILDLINK_API_DEPENDS.libsidplay+=		libsidplay>=1.36.38
+BUILDLINK_ABI_DEPENDS.libsidplay+=	libsidplay>=1.36.59nb2
 BUILDLINK_PKGSRCDIR.libsidplay?=	../../audio/libsidplay
 .endif	# LIBSIDPLAY_BUILDLINK3_MK
 
Index: ./audio/libsndfile/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsndfile/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/libsndfile/buildlink3.mk	5 Feb 2006 23:08:11 -0000	1.6
+++ ./audio/libsndfile/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsndfile
 
 .if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsndfile+=		libsndfile>=1.0.0
-BUILDLINK_RECOMMENDED.libsndfile+=	libsndfile>=1.0.13nb1
+BUILDLINK_API_DEPENDS.libsndfile+=		libsndfile>=1.0.0
+BUILDLINK_ABI_DEPENDS.libsndfile+=	libsndfile>=1.0.13nb1
 BUILDLINK_PKGSRCDIR.libsndfile?=	../../audio/libsndfile
 .endif	# LIBSNDFILE_BUILDLINK3_MK
 
Index: ./audio/libvisual/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libvisual/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/libvisual/buildlink3.mk	5 Feb 2006 23:08:11 -0000	1.4
+++ ./audio/libvisual/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libvisual
 
 .if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvisual+=	libvisual>=0.2.0
-BUILDLINK_RECOMMENDED.libvisual?=	libvisual>=0.2.0nb1
+BUILDLINK_API_DEPENDS.libvisual+=	libvisual>=0.2.0
+BUILDLINK_ABI_DEPENDS.libvisual?=	libvisual>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.libvisual?=	../../audio/libvisual
 .endif	# LIBVISUAL_BUILDLINK3_MK
 
Index: ./audio/libvorbis/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libvorbis/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/libvorbis/buildlink3.mk	3 Oct 2004 00:13:07 -0000	1.6
+++ ./audio/libvorbis/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libvorbis
 
 .if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libvorbis+=	libvorbis>=1.0.1
-BUILDLINK_RECOMMENDED.libvorbis+=	libvorbis>=1.1.0nb1
+BUILDLINK_API_DEPENDS.libvorbis+=	libvorbis>=1.0.1
+BUILDLINK_ABI_DEPENDS.libvorbis+=	libvorbis>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
 .endif	# LIBVORBIS_BUILDLINK3_MK
 
Index: ./audio/musicbrainz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/musicbrainz/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./audio/musicbrainz/buildlink3.mk	5 Feb 2006 23:08:12 -0000	1.9
+++ ./audio/musicbrainz/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	musicbrainz
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
-BUILDLINK_RECOMMENDED.musicbrainz+=	musicbrainz>=2.1.2nb2
+BUILDLINK_API_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
+BUILDLINK_ABI_DEPENDS.musicbrainz+=	musicbrainz>=2.1.2nb2
 BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
 .endif	# MUSICBRAINZ_BUILDLINK3_MK
 
Index: ./audio/nas/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/nas/buildlink3.mk	5 Feb 2006 23:08:12 -0000	1.5
+++ ./audio/nas/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nas
 
 .if !empty(NAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nas+=		nas>=1.4.2
-BUILDLINK_RECOMMENDED.nas?=	nas>=1.7bnb2
+BUILDLINK_API_DEPENDS.nas+=		nas>=1.4.2
+BUILDLINK_ABI_DEPENDS.nas?=	nas>=1.7bnb2
 BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
 .endif	# NAS_BUILDLINK3_MK
 
Index: ./audio/openal/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/openal/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./audio/openal/buildlink3.mk	5 Feb 2006 23:08:13 -0000	1.2
+++ ./audio/openal/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openal
 
 .if !empty(OPENAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openal+=	openal>=20030125nb1
-BUILDLINK_RECOMMENDED.openal?=	openal>=20040816nb1
+BUILDLINK_API_DEPENDS.openal+=	openal>=20030125nb1
+BUILDLINK_ABI_DEPENDS.openal?=	openal>=20040816nb1
 BUILDLINK_PKGSRCDIR.openal?=	../../audio/openal
 .endif	# OPENAL_BUILDLINK3_MK
 
Index: ./audio/portaudio/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/portaudio/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/portaudio/buildlink3.mk	5 Feb 2006 23:08:13 -0000	1.4
+++ ./audio/portaudio/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	portaudio
 
 .if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.portaudio+=	portaudio>=18.1
-BUILDLINK_RECOMMENDED.portaudio?=	portaudio>=18.1nb2
+BUILDLINK_API_DEPENDS.portaudio+=	portaudio>=18.1
+BUILDLINK_ABI_DEPENDS.portaudio?=	portaudio>=18.1nb2
 BUILDLINK_PKGSRCDIR.portaudio?=	../../audio/portaudio
 .endif	# PORTAUDIO_BUILDLINK3_MK
 
Index: ./audio/py-ogg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/py-ogg/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./audio/py-ogg/buildlink3.mk	5 Feb 2006 23:08:13 -0000	1.9
+++ ./audio/py-ogg/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyogg
 
 .if !empty(PY_OGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
-BUILDLINK_RECOMMENDED.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
+BUILDLINK_API_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
+BUILDLINK_ABI_DEPENDS.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
 .endif	# PY_OGG_BUILDLINK3_MK
 
Index: ./audio/rplay/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/rplay/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/rplay/buildlink3.mk	3 Oct 2004 00:13:09 -0000	1.4
+++ ./audio/rplay/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rplay
 
 .if !empty(RPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rplay+=	rplay>=3.3.2nb1
-BUILDLINK_RECOMMENDED.rplay+=	rplay>=3.3.2nb2
+BUILDLINK_API_DEPENDS.rplay+=	rplay>=3.3.2nb1
+BUILDLINK_ABI_DEPENDS.rplay+=	rplay>=3.3.2nb2
 BUILDLINK_PKGSRCDIR.rplay?=	../../audio/rplay
 .endif	# RPLAY_BUILDLINK3_MK
 
Index: ./audio/speex/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/speex/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/speex/buildlink3.mk	3 Oct 2004 00:13:09 -0000	1.6
+++ ./audio/speex/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	speex
 
 .if !empty(SPEEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.speex+=	speex>=1.0.4
-BUILDLINK_RECOMMENDED.speex+=	speex>=1.0.4nb1
+BUILDLINK_API_DEPENDS.speex+=	speex>=1.0.4
+BUILDLINK_ABI_DEPENDS.speex+=	speex>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.speex?=	../../audio/speex
 .endif	# SPEEX_BUILDLINK3_MK
 
Index: ./audio/streamtuner/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/streamtuner/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/streamtuner/buildlink3.mk	5 Feb 2006 23:08:14 -0000	1.5
+++ ./audio/streamtuner/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	streamtuner
 
 .if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.streamtuner+=		streamtuner>=0.99
-BUILDLINK_RECOMMENDED.streamtuner?=	streamtuner>=0.99.99nb2
+BUILDLINK_API_DEPENDS.streamtuner+=		streamtuner>=0.99
+BUILDLINK_ABI_DEPENDS.streamtuner?=	streamtuner>=0.99.99nb2
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
 .endif	# STREAMTUNER_BUILDLINK3_MK
 
Index: ./audio/sweep/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/sweep/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/sweep/buildlink3.mk	5 Feb 2006 23:08:14 -0000	1.5
+++ ./audio/sweep/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sweep
 
 .if !empty(SWEEP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sweep+=	sweep>=0.8.2nb6
-BUILDLINK_RECOMMENDED.sweep+=	sweep>=0.8.3nb3
+BUILDLINK_API_DEPENDS.sweep+=	sweep>=0.8.2nb6
+BUILDLINK_ABI_DEPENDS.sweep+=	sweep>=0.8.3nb3
 BUILDLINK_PKGSRCDIR.sweep?=	../../audio/sweep
 .endif	# SWEEP_BUILDLINK3_MK
 
Index: ./audio/taglib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/taglib/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/taglib/buildlink3.mk	6 Oct 2004 00:09:02 -0000	1.6
+++ ./audio/taglib/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	taglib
 
 .if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.taglib+=	taglib>=1.0
-BUILDLINK_RECOMMENDED.taglib+=	taglib>=1.3
+BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.0
+BUILDLINK_ABI_DEPENDS.taglib+=	taglib>=1.3
 BUILDLINK_PKGSRCDIR.taglib?=	../../audio/taglib
 .endif	# TAGLIB_BUILDLINK3_MK
 
Index: ./audio/tremor/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/tremor/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./audio/tremor/buildlink3.mk	5 Feb 2006 23:08:14 -0000	1.4
+++ ./audio/tremor/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tremor
 
 .if !empty(TREMOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tremor+=	tremor>=1.0.2
-BUILDLINK_RECOMMENDED.tremor+=	tremor>=1.0.2nb5
+BUILDLINK_API_DEPENDS.tremor+=	tremor>=1.0.2
+BUILDLINK_ABI_DEPENDS.tremor+=	tremor>=1.0.2nb5
 BUILDLINK_PKGSRCDIR.tremor?=	../../audio/tremor
 .endif	# TREMOR_BUILDLINK3_MK
 
Index: ./audio/tunepimp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/tunepimp/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/tunepimp/buildlink3.mk	5 Feb 2006 23:08:14 -0000	1.5
+++ ./audio/tunepimp/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tunepimp
 
 .if !empty(TUNEPIMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tunepimp+=	tunepimp>=0.3.0
-BUILDLINK_RECOMMENDED.tunepimp+=	tunepimp>=0.3.0nb4
+BUILDLINK_API_DEPENDS.tunepimp+=	tunepimp>=0.3.0
+BUILDLINK_ABI_DEPENDS.tunepimp+=	tunepimp>=0.3.0nb4
 BUILDLINK_PKGSRCDIR.tunepimp?=	../../audio/tunepimp
 .endif	# TUNEPIMP_BUILDLINK3_MK
 
Index: ./audio/tunesbrowser/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/tunesbrowser/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./audio/tunesbrowser/Makefile	6 Mar 2006 00:18:14 -0000	1.14
+++ ./audio/tunesbrowser/Makefile	4 Apr 2006 06:26:50 -0000
@@ -20,7 +20,7 @@
 DEPENDS+=		gst-plugins0.8-esound>=0.8.1:../../audio/gst-plugins0.8-esound
 DEPENDS+=		gst-plugins0.8-mad>=0.8.1:../../audio/gst-plugins0.8-mad
 
-BUILDLINK_DEPENDS.libopendaap+=	libopendaap>=0.4.0
+BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.4.0
 
 .include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .include "../../audio/libopendaap/buildlink3.mk"
Index: ./audio/wsoundserver/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/wsoundserver/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./audio/wsoundserver/buildlink3.mk	10 Mar 2006 22:32:21 -0000	1.6
+++ ./audio/wsoundserver/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	wsoundserver
 
 .if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
-BUILDLINK_RECOMMENDED.wsoundserver+=	wsoundserver>=0.4.0nb7
+BUILDLINK_API_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
+BUILDLINK_ABI_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb7
 BUILDLINK_PKGSRCDIR.wsoundserver?=	../../audio/wsoundserver
 .endif	# WSOUNDSERVER_BUILDLINK3_MK
 
Index: ./audio/xfce4-mixer/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xfce4-mixer/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./audio/xfce4-mixer/buildlink3.mk	17 Feb 2006 06:49:23 -0000	1.12
+++ ./audio/xfce4-mixer/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-mixer
 
 .if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mixer?=	xfce4-mixer>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mixer?=	xfce4-mixer>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 .endif	# XFCE4_MIXER_BUILDLINK3_MK
 
Index: ./audio/xfce4-xmms-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xfce4-xmms-plugin/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./audio/xfce4-xmms-plugin/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.8
+++ ./audio/xfce4-xmms-plugin/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
 
 .if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb2
+BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
+BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
 .endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
Index: ./audio/xmms/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./audio/xmms/buildlink3.mk	5 Feb 2006 23:08:17 -0000	1.5
+++ ./audio/xmms/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xmms
 
 .if !empty(XMMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms+=	xmms>=1.2.7nb10
-BUILDLINK_RECOMMENDED.xmms?=	xmms>=1.2.10nb6
+BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb10
+BUILDLINK_ABI_DEPENDS.xmms?=	xmms>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.xmms?=	../../audio/xmms
 .endif	# XMMS_BUILDLINK3_MK
 
Index: ./audio/xmms-esound/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-esound/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./audio/xmms-esound/Makefile	5 Feb 2006 23:08:17 -0000	1.8
+++ ./audio/xmms-esound/Makefile	4 Apr 2006 06:26:50 -0000
@@ -11,7 +11,7 @@
 
 CONFLICTS+=	xmms<=1.2.7nb8
 
-BUILDLINK_DEPENDS.xmms+=	xmms>=1.2.7nb9
+BUILDLINK_API_DEPENDS.xmms+=	xmms>=1.2.7nb9
 
 BUILD_DIRS=	${WRKSRC}/Output/esd
 INSTALL_DIRS=	${WRKSRC}/Output/esd
Index: ./audio/xmms-mad/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-mad/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./audio/xmms-mad/Makefile	5 Feb 2006 23:08:18 -0000	1.21
+++ ./audio/xmms-mad/Makefile	4 Apr 2006 06:26:50 -0000
@@ -15,7 +15,7 @@
 
 CPPFLAGS.NetBSD+=	-DHAVE_NANOSLEEP=1
 
-BUILDLINK_DEPENDS.libmad+=	libmad>=0.15.0bnb1
+BUILDLINK_API_DEPENDS.libmad+=	libmad>=0.15.0bnb1
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
Index: ./audio/xmms-meta-input/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms-meta-input/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./audio/xmms-meta-input/buildlink3.mk	5 Feb 2006 23:08:18 -0000	1.3
+++ ./audio/xmms-meta-input/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xmms-meta-input
 
 .if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
-BUILDLINK_RECOMMENDED.xmms-meta-input?=	xmms-meta-input>=0.4nb2
+BUILDLINK_API_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
+BUILDLINK_ABI_DEPENDS.xmms-meta-input?=	xmms-meta-input>=0.4nb2
 BUILDLINK_PKGSRCDIR.xmms-meta-input?=	../../audio/xmms-meta-input
 .endif	# XMMS_META_INPUT_BUILDLINK3_MK
 
Index: ./bootstrap/files/packages.cat7
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/files/packages.cat7,v
retrieving revision 1.3
diff -u -r1.3 packages.cat7
--- ./bootstrap/files/packages.cat7	7 May 2005 22:20:40 -0000	1.3
+++ ./bootstrap/files/packages.cat7	4 Apr 2006 06:26:50 -0000
@@ -477,15 +477,15 @@
                      this for packages that install identical set of files.
                      The format of this entry is ``pkgname''.
 
-           RECOMMENDED
+           ABI_DEPENDS
                      A list of recommended versions of pre-requisite packages.
                      This should be used together with ``DEPENDS'' to denote
                      which version of a pre-requisite is required and which
                      version is recommended.  The format of this entry is
                      ``pkgname:dir'', the same as for ``DEPENDS''.
 
-           IGNORE_RECOMMENDED
-                     If this is set to ``NO'' (the default), then RECOMMENDED
+           IGNORE_ABI_DEPENDS
+                     If this is set to ``NO'' (the default), then ABI_DEPENDS
                      pre-requisites will be turned into dependencies.  If set
                      to ``YES'', recommendations will be ignored and a warning
                      will be printed that packages created with this option
Index: ./cad/gplcver/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/gplcver/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./cad/gplcver/buildlink3.mk	10 Feb 2006 16:37:51 -0000	1.1.1.1
+++ ./cad/gplcver/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	gplcver
 
 .if !empty(GPLCVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gplcver+=	gplcver>=2.11a
+BUILDLINK_API_DEPENDS.gplcver+=	gplcver>=2.11a
 BUILDLINK_PKGSRCDIR.gplcver?=	../../cad/gplcver
 .endif	# GPLCVER_BUILDLINK3_MK
 
Index: ./cad/libgeda/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/libgeda/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./cad/libgeda/buildlink3.mk	11 Feb 2006 02:40:49 -0000	1.13
+++ ./cad/libgeda/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgeda
 
 .if !empty(LIBGEDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgeda+=	libgeda-20060123{,nb[0-9]*}
-BUILDLINK_RECOMMENDED.libgeda?=	libgeda>=20060123nb1
+BUILDLINK_API_DEPENDS.libgeda+=	libgeda-20060123{,nb[0-9]*}
+BUILDLINK_ABI_DEPENDS.libgeda?=	libgeda>=20060123nb1
 BUILDLINK_PKGSRCDIR.libgeda?=	../../cad/libgeda
 .endif	# LIBGEDA_BUILDLINK3_MK
 
Index: ./cad/libwcalc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/libwcalc/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./cad/libwcalc/buildlink3.mk	5 Feb 2006 23:08:22 -0000	1.3
+++ ./cad/libwcalc/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	libwcalc
 
 .if !empty(LIBWCALC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwcalc+=	libwcalc-1.0*
-BUILDLINK_RECOMMENDED.libwcalc?=	libwcalc>=1.0nb1
+BUILDLINK_API_DEPENDS.libwcalc+=	libwcalc-1.0*
+BUILDLINK_ABI_DEPENDS.libwcalc?=	libwcalc>=1.0nb1
 BUILDLINK_PKGSRCDIR.libwcalc?=	../../cad/libwcalc
 .endif	# LIBWCALC_BUILDLINK3_MK
 
Index: ./cad/spice/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/cad/spice/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./cad/spice/Makefile	5 Feb 2006 23:08:22 -0000	1.33
+++ ./cad/spice/Makefile	4 Apr 2006 06:26:50 -0000
@@ -15,7 +15,7 @@
 WRKSRC=			${WRKDIR}
 # GPL license used by GNU readline is not compatible
 # with 4 clause BSD license used by spice.
-#BUILDLINK_DEPENDS.readline=	readline>=4.0
+#BUILDLINK_API_DEPENDS.readline=	readline>=4.0
 #USE_GNU_READLINE=	uses rl_* interface
 
 # documentation in ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
Index: ./cad/verilog/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/verilog/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./cad/verilog/buildlink3.mk	10 Feb 2006 16:53:36 -0000	1.1
+++ ./cad/verilog/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	verilog
 
 .if !empty(VERILOG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.verilog+=	verilog>=0.8.1nb1
+BUILDLINK_API_DEPENDS.verilog+=	verilog>=0.8.1nb1
 BUILDLINK_PKGSRCDIR.verilog?=	../../cad/verilog
 .endif	# VERILOG_BUILDLINK3_MK
 
Index: ./cad/verilog-current/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/verilog-current/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./cad/verilog-current/buildlink3.mk	5 Feb 2006 23:08:23 -0000	1.3
+++ ./cad/verilog-current/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	verilog-current
 
 .if !empty(VERILOG_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.verilog-current+=	verilog-current>=20021019
-BUILDLINK_RECOMMENDED.verilog-current?=	verilog-current>=20060124nb1
+BUILDLINK_API_DEPENDS.verilog-current+=	verilog-current>=20021019
+BUILDLINK_ABI_DEPENDS.verilog-current?=	verilog-current>=20060124nb1
 BUILDLINK_PKGSRCDIR.verilog-current?=	../../cad/verilog-current
 .endif	# VERILOG_CURRENT_BUILDLINK3_MK
 
Index: ./chat/ekg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/ekg/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./chat/ekg/buildlink3.mk	5 Feb 2006 23:08:23 -0000	1.13
+++ ./chat/ekg/buildlink3.mk	4 Apr 2006 06:26:50 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ekg
 
 .if !empty(EKG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ekg+=		ekg>=1.6
-BUILDLINK_RECOMMENDED.ekg?=	ekg>=1.6nb4
+BUILDLINK_API_DEPENDS.ekg+=		ekg>=1.6
+BUILDLINK_ABI_DEPENDS.ekg?=	ekg>=1.6nb4
 BUILDLINK_PKGSRCDIR.ekg?=	../../chat/ekg
 .endif	# EKG_BUILDLINK3_MK
 
Index: ./chat/gaim/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gaim/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./chat/gaim/buildlink3.mk	5 Feb 2006 23:08:24 -0000	1.9
+++ ./chat/gaim/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gaim
 
 .if !empty(GAIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gaim+=	gaim>=1.1.2
-BUILDLINK_RECOMMENDED.gaim+=	gaim>=1.5.0nb4
+BUILDLINK_API_DEPENDS.gaim+=	gaim>=1.1.2
+BUILDLINK_ABI_DEPENDS.gaim+=	gaim>=1.5.0nb4
 BUILDLINK_PKGSRCDIR.gaim?=	../../chat/gaim
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gaim$$/ \
Index: ./chat/gale/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/gale/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./chat/gale/buildlink3.mk	5 Feb 2006 23:08:24 -0000	1.2
+++ ./chat/gale/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gale
 
 .if !empty(GALE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gale+=	gale>=0.99f
-BUILDLINK_RECOMMENDED.gale?=	gale>=0.99fnb1
+BUILDLINK_API_DEPENDS.gale+=	gale>=0.99f
+BUILDLINK_ABI_DEPENDS.gale?=	gale>=0.99fnb1
 BUILDLINK_PKGSRCDIR.gale?=	../../chat/gale
 .endif	# GALE_BUILDLINK3_MK
 
Index: ./chat/jabberd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./chat/jabberd/buildlink3.mk	5 Feb 2006 23:08:24 -0000	1.8
+++ ./chat/jabberd/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	jabberd
 
 .if !empty(JABBERD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jabberd+=	jabberd>=1.4.2
-BUILDLINK_RECOMMENDED.jabberd?=	jabberd>=1.4.2nb5
+BUILDLINK_API_DEPENDS.jabberd+=	jabberd>=1.4.2
+BUILDLINK_ABI_DEPENDS.jabberd?=	jabberd>=1.4.2nb5
 BUILDLINK_PKGSRCDIR.jabberd?=	../../chat/jabberd
 .endif	# JABBERD_BUILDLINK3_MK
 
Index: ./chat/jabberd2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/jabberd2/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./chat/jabberd2/Makefile	5 Feb 2006 23:08:25 -0000	1.29
+++ ./chat/jabberd2/Makefile	4 Apr 2006 06:26:51 -0000
@@ -15,7 +15,7 @@
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6b
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.6b
 BUILDLINK_TRANSFORM.db4=	-e "s,/db4/,/,g"
 
 SUBST_CLASSES+=		path
Index: ./chat/libirc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/libirc/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./chat/libirc/buildlink3.mk	3 Oct 2004 00:13:15 -0000	1.2
+++ ./chat/libirc/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libirc
 
 .if !empty(LIBIRC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libirc+=	libirc>=0.2nb1
-BUILDLINK_RECOMMENDED.libirc+=	libirc>=0.2nb2
+BUILDLINK_API_DEPENDS.libirc+=	libirc>=0.2nb1
+BUILDLINK_ABI_DEPENDS.libirc+=	libirc>=0.2nb2
 BUILDLINK_PKGSRCDIR.libirc?=	../../chat/libirc
 .endif	# LIBIRC_BUILDLINK3_MK
 
Index: ./chat/libotr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/libotr/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./chat/libotr/buildlink3.mk	13 Feb 2006 14:44:31 -0000	1.5
+++ ./chat/libotr/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libotr
 
 .if !empty(LIBOTR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libotr+=	libotr>=3.0.0
+BUILDLINK_API_DEPENDS.libotr+=	libotr>=3.0.0
 BUILDLINK_PKGSRCDIR.libotr?=	../../chat/libotr
 .endif	# LIBOTR_BUILDLINK3_MK
 
Index: ./chat/libtlen/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/libtlen/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./chat/libtlen/buildlink3.mk	5 Feb 2006 18:55:22 -0000	1.5
+++ ./chat/libtlen/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtlen
 
 .if !empty(LIBTLEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtlen+=	libtlen>=20040212
-BUILDLINK_RECOMMENDED.libtlen+=	libtlen>=20040212nb1
+BUILDLINK_API_DEPENDS.libtlen+=	libtlen>=20040212
+BUILDLINK_ABI_DEPENDS.libtlen+=	libtlen>=20040212nb1
 BUILDLINK_PKGSRCDIR.libtlen?=	../../chat/libtlen
 .endif	# LIBTLEN_BUILDLINK3_MK
 
Index: ./chat/licq-gui-qt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/licq-gui-qt/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./chat/licq-gui-qt/Makefile	4 Mar 2006 21:29:03 -0000	1.22
+++ ./chat/licq-gui-qt/Makefile	4 Apr 2006 06:26:51 -0000
@@ -12,7 +12,7 @@
 HOMEPAGE=	http://www.licq.org/
 COMMENT=	Qt GUI for licq
 
-BUILDLINK_DEPENDS.qt3-libs?=    qt3-libs>=3.0
+BUILDLINK_API_DEPENDS.qt3-libs?=    qt3-libs>=3.0
 DEPENDS+=	licq-core-[0-9]*:../../chat/licq-core
 
 .include "../../mk/bsd.prefs.mk"
Index: ./chat/loudmouth/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/loudmouth/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./chat/loudmouth/Makefile	6 Mar 2006 00:18:10 -0000	1.20
+++ ./chat/loudmouth/Makefile	4 Apr 2006 06:26:51 -0000
@@ -20,7 +20,7 @@
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--disable-mono
 
-BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.2.0
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.2.0
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./chat/loudmouth/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/loudmouth/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./chat/loudmouth/buildlink3.mk	5 Feb 2006 23:08:25 -0000	1.9
+++ ./chat/loudmouth/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	loudmouth
 
 .if !empty(LOUDMOUTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.loudmouth+=	loudmouth>=1.0
-BUILDLINK_RECOMMENDED.loudmouth?=	loudmouth>=1.0.1nb2
+BUILDLINK_API_DEPENDS.loudmouth+=	loudmouth>=1.0
+BUILDLINK_ABI_DEPENDS.loudmouth?=	loudmouth>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.loudmouth?=	../../chat/loudmouth
 .endif	# LOUDMOUTH_BUILDLINK3_MK
 
Index: ./chat/psi/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- ./chat/psi/Makefile	23 Mar 2006 02:24:58 -0000	1.39
+++ ./chat/psi/Makefile	4 Apr 2006 06:26:51 -0000
@@ -76,6 +76,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/qca/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./chat/unrealircd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/unrealircd/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./chat/unrealircd/Makefile	7 Mar 2006 17:23:51 -0000	1.11
+++ ./chat/unrealircd/Makefile	4 Apr 2006 06:26:51 -0000
@@ -21,8 +21,8 @@
 TRE_NEEDED=	0.7.2
 CARES_NEEDED=	1.3.0
 
-BUILDLINK_DEPENDS.tre+=		tre-${TRE_NEEDED}
-BUILDLINK_DEPENDS.libcares+=	libcares-${CARES_NEEDED}
+BUILDLINK_API_DEPENDS.tre+=		tre-${TRE_NEEDED}
+BUILDLINK_API_DEPENDS.libcares+=	libcares-${CARES_NEEDED}
 
 .include "../../mk/bsd.prefs.mk"
 
Index: ./chat/zephyr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/chat/zephyr/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./chat/zephyr/buildlink3.mk	5 Feb 2006 23:08:26 -0000	1.3
+++ ./chat/zephyr/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	zephyr
 
 .if !empty(ZEPHYR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zephyr+=	zephyr>=20010518nb1
-BUILDLINK_RECOMMENDED.zephyr?=	zephyr>=20010518nb4
+BUILDLINK_API_DEPENDS.zephyr+=	zephyr>=20010518nb1
+BUILDLINK_ABI_DEPENDS.zephyr?=	zephyr>=20010518nb4
 BUILDLINK_PKGSRCDIR.zephyr?=	../../chat/zephyr
 BUILDLINK_DEPMETHOD.zephyr?=	build
 .endif	# ZEPHYR_BUILDLINK3_MK
Index: ./comms/gnome-pilot/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/gnome-pilot/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./comms/gnome-pilot/buildlink3.mk	5 Feb 2006 23:08:27 -0000	1.9
+++ ./comms/gnome-pilot/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-pilot
 
 .if !empty(GNOME_PILOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-pilot?=		gnome-pilot>=2.0.12nb2
-BUILDLINK_RECOMMENDED.gnome-pilot?=	gnome-pilot>=2.0.12nb4
+BUILDLINK_API_DEPENDS.gnome-pilot?=		gnome-pilot>=2.0.12nb2
+BUILDLINK_ABI_DEPENDS.gnome-pilot?=	gnome-pilot>=2.0.12nb4
 BUILDLINK_PKGSRCDIR.gnome-pilot?=	../../comms/gnome-pilot
 .endif	# GNOME_PILOT_BUILDLINK3_MK
 
Index: ./comms/jpilot/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/jpilot/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./comms/jpilot/buildlink3.mk	5 Feb 2006 23:08:27 -0000	1.6
+++ ./comms/jpilot/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	jpilot
 
 .if !empty(JPILOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jpilot+=	jpilot>=0.99.5nb4
-BUILDLINK_RECOMMENDED.jpilot+=	jpilot>=0.99.7nb2
+BUILDLINK_API_DEPENDS.jpilot+=	jpilot>=0.99.5nb4
+BUILDLINK_ABI_DEPENDS.jpilot+=	jpilot>=0.99.7nb2
 BUILDLINK_PKGSRCDIR.jpilot?=	../../comms/jpilot
 .endif	# JPILOT_BUILDLINK3_MK
 
Index: ./comms/libmal/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/libmal/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./comms/libmal/buildlink3.mk	5 Feb 2006 23:08:27 -0000	1.3
+++ ./comms/libmal/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmal
 
 .if !empty(LIBMAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmal+=	libmal>=0.40
-BUILDLINK_RECOMMENDED.libmal+=	libmal>=0.40nb2
+BUILDLINK_API_DEPENDS.libmal+=	libmal>=0.40
+BUILDLINK_ABI_DEPENDS.libmal+=	libmal>=0.40nb2
 BUILDLINK_PKGSRCDIR.libmal?=	../../comms/libmal
 .endif	# LIBMAL_BUILDLINK3_MK
 
Index: ./comms/openobex/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/openobex/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./comms/openobex/buildlink3.mk	5 Feb 2006 23:08:28 -0000	1.4
+++ ./comms/openobex/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openobex
 
 .if !empty(OPENOBEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openobex+=	openobex>=1.0.1
-BUILDLINK_RECOMMENDED.openobex+=	openobex>=1.0.1nb2
+BUILDLINK_API_DEPENDS.openobex+=	openobex>=1.0.1
+BUILDLINK_ABI_DEPENDS.openobex+=	openobex>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.openobex?=	../../comms/openobex
 .endif	# OPENOBEX_BUILDLINK3_MK
 
Index: ./comms/p5-pilot-link/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/p5-pilot-link/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./comms/p5-pilot-link/Makefile	5 Feb 2006 23:08:28 -0000	1.30
+++ ./comms/p5-pilot-link/Makefile	4 Apr 2006 06:26:51 -0000
@@ -8,7 +8,7 @@
 
 COMMENT=		Perl bindings for pilot-link
 
-BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
+BUILDLINK_API_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
 USE_TOOLS+=		gmake
 
Index: ./comms/pilot-link/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/pilot-link/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- ./comms/pilot-link/Makefile	5 Feb 2006 23:08:28 -0000	1.43
+++ ./comms/pilot-link/Makefile	4 Apr 2006 06:26:51 -0000
@@ -6,7 +6,7 @@
 
 COMMENT=		Tools to talk to the 3Com Pilot PDA
 
-BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
+BUILDLINK_API_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
 USE_TOOLS+=		gmake perl:run
 USE_GNU_READLINE=	YES
Index: ./comms/pilot-link-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/pilot-link-libs/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./comms/pilot-link-libs/buildlink3.mk	3 Oct 2004 00:13:16 -0000	1.4
+++ ./comms/pilot-link-libs/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pilot-link-libs
 
 .if !empty(PILOT_LINK_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pilot-link-libs+=	pilot-link-libs>=0.11.7nb1
-BUILDLINK_RECOMMENDED.pilot-link-libs+=	pilot-link-libs>=0.11.7nb2
+BUILDLINK_API_DEPENDS.pilot-link-libs+=	pilot-link-libs>=0.11.7nb1
+BUILDLINK_ABI_DEPENDS.pilot-link-libs+=	pilot-link-libs>=0.11.7nb2
 BUILDLINK_PKGSRCDIR.pilot-link-libs?=	../../comms/pilot-link-libs
 .endif	# PILOT_LINK_LIBS_BUILDLINK3_MK
 
Index: ./comms/synce-librapi2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/synce-librapi2/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./comms/synce-librapi2/buildlink3.mk	13 Oct 2005 15:03:42 -0000	1.1.1.1
+++ ./comms/synce-librapi2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	synce-librapi2
 
 .if !empty(SYNCE_LIBRAPI2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.synce-librapi2+=	synce-librapi2>=0.9.1
+BUILDLINK_API_DEPENDS.synce-librapi2+=	synce-librapi2>=0.9.1
 BUILDLINK_PKGSRCDIR.synce-librapi2?=	../../comms/synce-librapi2
 .endif	# SYNCE_LIBRAPI2_BUILDLINK3_MK
 
Index: ./comms/synce-libsynce/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/synce-libsynce/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./comms/synce-libsynce/buildlink3.mk	13 Oct 2005 15:00:13 -0000	1.1.1.1
+++ ./comms/synce-libsynce/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	synce-libsynce
 
 .if !empty(SYNCE_LIBSYNCE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.synce-libsynce+=	synce-libsynce>=0.9.1
+BUILDLINK_API_DEPENDS.synce-libsynce+=	synce-libsynce>=0.9.1
 BUILDLINK_PKGSRCDIR.synce-libsynce?=	../../comms/synce-libsynce
 .endif	# SYNCE_LIBSYNCE_BUILDLINK3_MK
 
Index: ./comms/zaptel-netbsd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/comms/zaptel-netbsd/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./comms/zaptel-netbsd/buildlink3.mk	5 Feb 2006 23:08:28 -0000	1.3
+++ ./comms/zaptel-netbsd/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	zaptel-netbsd
 
 .if !empty(ZAPTEL_NETBSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zaptel-netbsd+=	zaptel-netbsd>=20050314
-BUILDLINK_RECOMMENDED.zaptel-netbsd?=	zaptel-netbsd>=20060127nb1
+BUILDLINK_API_DEPENDS.zaptel-netbsd+=	zaptel-netbsd>=20050314
+BUILDLINK_ABI_DEPENDS.zaptel-netbsd?=	zaptel-netbsd>=20060127nb1
 BUILDLINK_PKGSRCDIR.zaptel-netbsd?=	../../comms/zaptel-netbsd
 BUILDLINK_DEPMETHOD.zaptel-netbsd?=	build
 .endif	# ZAPTEL_NETBSD_BUILDLINK3_MK
Index: ./converters/fribidi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/fribidi/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./converters/fribidi/buildlink3.mk	3 Oct 2004 00:13:17 -0000	1.3
+++ ./converters/fribidi/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fribidi
 
 .if !empty(FRIBIDI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fribidi+=	fribidi>=0.10.4
-BUILDLINK_RECOMMENDED.fribidi+=	fribidi>=0.10.4nb1
+BUILDLINK_API_DEPENDS.fribidi+=	fribidi>=0.10.4
+BUILDLINK_ABI_DEPENDS.fribidi+=	fribidi>=0.10.4nb1
 BUILDLINK_PKGSRCDIR.fribidi?=	../../converters/fribidi
 .endif	# FRIBIDI_BUILDLINK3_MK
 
Index: ./converters/libiconv/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/libiconv/buildlink3.mk,v
retrieving revision 1.21
diff -u -r1.21 buildlink3.mk
--- ./converters/libiconv/buildlink3.mk	3 Oct 2004 00:13:17 -0000	1.21
+++ ./converters/libiconv/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	iconv
 
 .if !empty(ICONV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iconv+=	libiconv>=1.9.1
-BUILDLINK_RECOMMENDED.iconv+=	libiconv>=1.9.1nb4
+BUILDLINK_API_DEPENDS.iconv+=	libiconv>=1.9.1
+BUILDLINK_ABI_DEPENDS.iconv+=	libiconv>=1.9.1nb4
 BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 .endif	# ICONV_BUILDLINK3_MK
 
Index: ./converters/libiconv/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/libiconv/builtin.mk,v
retrieving revision 1.14
diff -u -r1.14 builtin.mk
--- ./converters/libiconv/builtin.mk	6 Jun 2005 01:30:56 -0000	1.14
+++ ./converters/libiconv/builtin.mk	4 Apr 2006 06:26:51 -0000
@@ -63,7 +63,7 @@
 .    if defined(BUILTIN_PKG.iconv) && \
         !empty(IS_BUILTIN.iconv:M[yY][eE][sS])
 USE_BUILTIN.iconv=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.iconv}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.iconv}
 .        if !empty(USE_BUILTIN.iconv:M[yY][eE][sS])
 USE_BUILTIN.iconv!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.iconv:Q}; then	\
Index: ./converters/libwpd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/libwpd/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./converters/libwpd/buildlink3.mk	8 Feb 2006 09:42:53 -0000	1.6
+++ ./converters/libwpd/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libwpd
 
 .if !empty(LIBWPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwpd+=	libwpd>=0.8.1nb1
-BUILDLINK_RECOMMENDED.libwpd?=	libwpd>=0.8.4
+BUILDLINK_API_DEPENDS.libwpd+=	libwpd>=0.8.1nb1
+BUILDLINK_ABI_DEPENDS.libwpd?=	libwpd>=0.8.4
 BUILDLINK_PKGSRCDIR.libwpd?=	../../converters/libwpd
 .endif	# LIBWPD_BUILDLINK3_MK
 
Index: ./converters/psiconv/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/psiconv/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./converters/psiconv/buildlink3.mk	28 Dec 2004 23:18:18 -0000	1.4
+++ ./converters/psiconv/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	psiconv
 
 .if !empty(PSICONV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.psiconv+=	psiconv>=0.8.3nb1
-BUILDLINK_RECOMMENDED.psiconv+=	psiconv>=0.9.6nb1
+BUILDLINK_API_DEPENDS.psiconv+=	psiconv>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.psiconv+=	psiconv>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.psiconv?=	../../converters/psiconv
 .endif	# PSICONV_BUILDLINK3_MK
 
Index: ./converters/recode/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/recode/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./converters/recode/buildlink3.mk	5 Feb 2006 23:08:29 -0000	1.3
+++ ./converters/recode/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	recode
 
 .if !empty(RECODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.recode+=	recode>=3.6nb1
-BUILDLINK_RECOMMENDED.recode+=	recode>=3.6nb3
+BUILDLINK_API_DEPENDS.recode+=	recode>=3.6nb1
+BUILDLINK_ABI_DEPENDS.recode+=	recode>=3.6nb3
 BUILDLINK_PKGSRCDIR.recode?=	../../converters/recode
 .endif	# RECODE_BUILDLINK3_MK
 
Index: ./converters/uulib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/uulib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./converters/uulib/buildlink3.mk	3 Oct 2004 00:13:17 -0000	1.2
+++ ./converters/uulib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	uulib
 
 .if !empty(UULIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.uulib+=	uulib>=0.5.20
-BUILDLINK_RECOMMENDED.uulib+=	uulib>=0.5.20nb2
+BUILDLINK_API_DEPENDS.uulib+=	uulib>=0.5.20
+BUILDLINK_ABI_DEPENDS.uulib+=	uulib>=0.5.20nb2
 BUILDLINK_PKGSRCDIR.uulib?=	../../converters/uulib
 .endif	# UULIB_BUILDLINK3_MK
 
Index: ./converters/wv/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/wv/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./converters/wv/buildlink3.mk	5 Feb 2006 23:08:29 -0000	1.10
+++ ./converters/wv/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	wv
 
 .if !empty(WV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wv+=		wv>=1.0.0
-BUILDLINK_RECOMMENDED.wv+=	wv>=1.2.0nb2
+BUILDLINK_API_DEPENDS.wv+=		wv>=1.0.0
+BUILDLINK_ABI_DEPENDS.wv+=	wv>=1.2.0nb2
 BUILDLINK_PKGSRCDIR.wv?=	../../converters/wv
 .endif	# WV_BUILDLINK3_MK
 
Index: ./converters/wv2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/converters/wv2/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./converters/wv2/buildlink3.mk	5 Feb 2006 23:08:29 -0000	1.6
+++ ./converters/wv2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	wv2
 
 .if !empty(WV2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wv2?=		wv2>=0.2.2nb1
-BUILDLINK_RECOMMENDED.wv2?=	wv2>=0.2.2nb4
+BUILDLINK_API_DEPENDS.wv2?=		wv2>=0.2.2nb1
+BUILDLINK_ABI_DEPENDS.wv2?=	wv2>=0.2.2nb4
 BUILDLINK_PKGSRCDIR.wv2?=	../../converters/wv2
 .endif	# WV2_BUILDLINK3_MK
 
Index: ./cross/binutils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cross/binutils/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./cross/binutils/buildlink3.mk	5 Apr 2005 11:04:20 -0000	1.1
+++ ./cross/binutils/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	cross-binutils
 
 .if !empty(CROSS_BINUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cross-binutils+=	cross-binutils>=2.15.0.0nb3
+BUILDLINK_API_DEPENDS.cross-binutils+=	cross-binutils>=2.15.0.0nb3
 BUILDLINK_PKGSRCDIR.cross-binutils?=	../../cross/binutils
 .endif	# CROSS_BINUTILS_BUILDLINK3_MK
 
Index: ./databases/bdb-xml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/bdb-xml/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./databases/bdb-xml/buildlink3.mk	5 Feb 2006 23:08:30 -0000	1.4
+++ ./databases/bdb-xml/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	bdb-xml
 
 .if !empty(BDB_XML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
-BUILDLINK_RECOMMENDED.bdb-xml?=	bdb-xml>=1.2.1nb4
+BUILDLINK_API_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
+BUILDLINK_ABI_DEPENDS.bdb-xml?=	bdb-xml>=1.2.1nb4
 BUILDLINK_PKGSRCDIR.bdb-xml?=	../../databases/bdb-xml
 .endif	# BDB_XML_BUILDLINK3_MK
 
Index: ./databases/db/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/db/buildlink3.mk,v
retrieving revision 1.19
diff -u -r1.19 buildlink3.mk
--- ./databases/db/buildlink3.mk	15 Nov 2004 17:54:49 -0000	1.19
+++ ./databases/db/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	db2
 
 .if !empty(DB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db2+=		db>=2.7.3
-BUILDLINK_RECOMMENDED.db2+=	db>=2.7.7nb2
+BUILDLINK_API_DEPENDS.db2+=		db>=2.7.3
+BUILDLINK_ABI_DEPENDS.db2+=	db>=2.7.7nb2
 BUILDLINK_PKGSRCDIR.db2?=	../../databases/db
 BUILDLINK_INCDIRS.db2?=		include/db2
 BUILDLINK_LDADD.db2=		-ldb2
Index: ./databases/db3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/db3/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./databases/db3/buildlink3.mk	15 Nov 2004 17:54:49 -0000	1.16
+++ ./databases/db3/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	db3
 
 .if !empty(DB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db3+=		db3>=2.9.2
-BUILDLINK_RECOMMENDED.db3+=	db3>=3.11.2nb3
+BUILDLINK_API_DEPENDS.db3+=		db3>=2.9.2
+BUILDLINK_ABI_DEPENDS.db3+=	db3>=3.11.2nb3
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 BUILDLINK_INCDIRS.db3?=		include/db3
 BUILDLINK_LDADD.db3=		-ldb3
Index: ./databases/db4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/db4/buildlink3.mk,v
retrieving revision 1.25
diff -u -r1.25 buildlink3.mk
--- ./databases/db4/buildlink3.mk	6 Jan 2006 15:08:47 -0000	1.25
+++ ./databases/db4/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	db4
 
 .if !empty(DB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.db4+=		db4>=4.4.16
+BUILDLINK_API_DEPENDS.db4+=		db4>=4.4.16
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
 BUILDLINK_LDADD.db4=		-ldb4
@@ -23,7 +23,7 @@
 #
 # Older db4 packages didn't enable the db-1.85 compatibility API.
 #
-BUILDLINK_DEPENDS.db4+=		db4>=4.2.52nb1
+BUILDLINK_API_DEPENDS.db4+=		db4>=4.2.52nb1
 BUILDLINK_LIBS.db4=		${BUILDLINK_LDADD.db4}
 BUILDLINK_TRANSFORM+=		l:db:db4
 .  endif
Index: ./databases/dbh/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/dbh/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/dbh/buildlink3.mk	16 Mar 2005 13:29:46 -0000	1.3
+++ ./databases/dbh/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	dbh
 
 .if !empty(DBH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbh+=		dbh>=1.0.22
+BUILDLINK_API_DEPENDS.dbh+=		dbh>=1.0.22
 BUILDLINK_PKGSRCDIR.dbh?=	../../databases/dbh
 .endif	# DBH_BUILDLINK3_MK
 
Index: ./databases/edb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/edb/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/edb/buildlink3.mk	5 Feb 2006 23:08:30 -0000	1.3
+++ ./databases/edb/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	edb
 
 .if !empty(EDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edb+=	edb>=1.0.3nb3
-BUILDLINK_RECOMMENDED.edb+=	edb>=1.0.3nb5
+BUILDLINK_API_DEPENDS.edb+=	edb>=1.0.3nb3
+BUILDLINK_ABI_DEPENDS.edb+=	edb>=1.0.3nb5
 BUILDLINK_PKGSRCDIR.edb?=	../../databases/edb
 .endif	# EDB_BUILDLINK3_MK
 
Index: ./databases/freetds/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/freetds/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./databases/freetds/buildlink3.mk	5 Feb 2006 23:08:30 -0000	1.6
+++ ./databases/freetds/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	freetds
 
 .if !empty(FREETDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63nb2
-BUILDLINK_RECOMMENDED.freetds?=	freetds>=0.63nb4
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63nb2
+BUILDLINK_ABI_DEPENDS.freetds?=	freetds>=0.63nb4
 BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
 .endif	# FREETDS_BUILDLINK3_MK
 
Index: ./databases/gdbm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/gdbm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/gdbm/buildlink3.mk	3 Oct 2004 00:13:18 -0000	1.3
+++ ./databases/gdbm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gdbm
 
 .if !empty(GDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdbm+=	gdbm>=1.8.3
-BUILDLINK_RECOMMENDED.gdbm+=	gdbm>=1.8.3nb1
+BUILDLINK_API_DEPENDS.gdbm+=	gdbm>=1.8.3
+BUILDLINK_ABI_DEPENDS.gdbm+=	gdbm>=1.8.3nb1
 BUILDLINK_PKGSRCDIR.gdbm?=	../../databases/gdbm
 .endif	# GDBM_BUILDLINK3_MK
 
Index: ./databases/geneweb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/geneweb/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./databases/geneweb/Makefile	9 Mar 2006 10:35:49 -0000	1.29
+++ ./databases/geneweb/Makefile	4 Apr 2006 06:26:51 -0000
@@ -23,7 +23,7 @@
 
 # needed for patch-ab to work:
 # since 3.09.0, camlp4 uses _loc instead of loc
-BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.09.0
+BUILDLINK_API_DEPENDS.ocaml+=       ocaml>=3.09.0
 
 # sysutils/coreutils a 'gwc' program, so conflict with it if
 # ${GNU_PROGRAM_PREFIX} == "g"
Index: ./databases/gnome-mime-data/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/gnome-mime-data/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./databases/gnome-mime-data/buildlink3.mk	5 Feb 2006 23:08:31 -0000	1.6
+++ ./databases/gnome-mime-data/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-mime-data
 
 .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
-BUILDLINK_RECOMMENDED.gnome-mime-data?=	gnome-mime-data>=2.4.2nb2
+BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.4.0
+BUILDLINK_ABI_DEPENDS.gnome-mime-data?=	gnome-mime-data>=2.4.2nb2
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=	../../databases/gnome-mime-data
 
 # intltool-{extract,merge,update} are Perl scripts included in the sources
Index: ./databases/iodbc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/iodbc/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/iodbc/buildlink3.mk	30 Dec 2005 21:03:59 -0000	1.3
+++ ./databases/iodbc/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	iodbc
 
 .if !empty(IODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iodbc+=	iodbc>=3.52.3
+BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
 BUILDLINK_PKGSRCDIR.iodbc?=	../../databases/iodbc
 .endif	# IODBC_BUILDLINK3_MK
 
Index: ./databases/libgda/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/libgda/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./databases/libgda/buildlink3.mk	5 Feb 2006 23:08:31 -0000	1.9
+++ ./databases/libgda/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgda
 
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgda+=	libgda>=1.9.100
-BUILDLINK_RECOMMENDED.libgda?=	libgda>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgda+=	libgda>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgda?=	libgda>=1.9.100nb1
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda-1.9\/providers$$/ \
Index: ./databases/libgnomedb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/libgnomedb/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./databases/libgnomedb/buildlink3.mk	5 Feb 2006 23:08:32 -0000	1.10
+++ ./databases/libgnomedb/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomedb
 
 .if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomedb+=		libgnomedb>=1.9.100
-BUILDLINK_RECOMMENDED.libgnomedb?=	libgnomedb>=1.9.100nb1
+BUILDLINK_API_DEPENDS.libgnomedb+=		libgnomedb>=1.9.100
+BUILDLINK_ABI_DEPENDS.libgnomedb?=	libgnomedb>=1.9.100nb1
 BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
 .endif	# LIBGNOMEDB_BUILDLINK3_MK
 
Index: ./databases/libpqxx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/libpqxx/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/libpqxx/buildlink3.mk	5 Feb 2006 23:08:32 -0000	1.2
+++ ./databases/libpqxx/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libpqxx
 
 .if !empty(LIBPQXX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpqxx+=	libpqxx>=2.5.0
-BUILDLINK_RECOMMENDED.libpqxx?=	libpqxx>=2.5.4nb1
+BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=2.5.0
+BUILDLINK_ABI_DEPENDS.libpqxx?=	libpqxx>=2.5.4nb1
 BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
 .endif	# LIBPQXX_BUILDLINK3_MK
 
Index: ./databases/metakit-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/metakit-lib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/metakit-lib/buildlink3.mk	3 Oct 2004 00:13:21 -0000	1.2
+++ ./databases/metakit-lib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	metakit-lib
 
 .if !empty(METAKIT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
-BUILDLINK_RECOMMENDED.metakit-lib+=	metakit-lib>=2.4.9.3nb1
+BUILDLINK_API_DEPENDS.metakit-lib+=	metakit-lib>=2.4.8
+BUILDLINK_ABI_DEPENDS.metakit-lib+=	metakit-lib>=2.4.9.3nb1
 BUILDLINK_PKGSRCDIR.metakit-lib?=	../../databases/metakit-lib
 .endif	# METAKIT_LIB_BUILDLINK3_MK
 
Index: ./databases/mysql4-client/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql4-client/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./databases/mysql4-client/buildlink3.mk	5 Feb 2006 23:08:32 -0000	1.13
+++ ./databases/mysql4-client/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.1.7
-BUILDLINK_RECOMMENDED.mysql-client+=	mysql-client>=4.1.15nb1
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=4.1.7
+BUILDLINK_ABI_DEPENDS.mysql-client+=	mysql-client>=4.1.15nb1
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql4-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
Index: ./databases/mysql5-client/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql5-client/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/mysql5-client/buildlink3.mk	5 Feb 2006 23:08:32 -0000	1.2
+++ ./databases/mysql5-client/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=5.0.15
-BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=5.0.18nb1
+BUILDLINK_API_DEPENDS.mysql-client+=	mysql-client>=5.0.15
+BUILDLINK_ABI_DEPENDS.mysql-client?=	mysql-client>=5.0.18nb1
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql5-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 BUILDLINK_INCDIRS.mysql-client?=	include/mysql
Index: ./databases/openldap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/buildlink3.mk,v
retrieving revision 1.22
diff -u -r1.22 buildlink3.mk
--- ./databases/openldap/buildlink3.mk	6 Jan 2006 15:10:02 -0000	1.22
+++ ./databases/openldap/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	openldap
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+=		openldap>=2.3.11nb2
+BUILDLINK_API_DEPENDS.openldap+=		openldap>=2.3.11nb2
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 
 # Export the deprecated API from the openldap-2.2.x releases.
Index: ./databases/openldap/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap/options.mk,v
retrieving revision 1.15
diff -u -r1.15 options.mk
--- ./databases/openldap/options.mk	29 Dec 2005 20:10:23 -0000	1.15
+++ ./databases/openldap/options.mk	4 Apr 2006 06:26:51 -0000
@@ -61,7 +61,7 @@
 ###
 .if !empty(PKG_OPTIONS:Msasl)
 CONFIGURE_ARGS+=		--with-cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
+BUILDLINK_API_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=		--without-cyrus-sasl
Index: ./databases/p5-DBD-Google/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/p5-DBD-Google/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./databases/p5-DBD-Google/Makefile	4 Mar 2006 21:29:09 -0000	1.8
+++ ./databases/p5-DBD-Google/Makefile	4 Apr 2006 06:26:51 -0000
@@ -14,7 +14,7 @@
 
 PERL5_PACKLIST=		auto/DBD/Google/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.39
+BUILDLINK_API_DEPENDS.p5-DBI?=	p5-DBI>=1.39
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 
Index: ./databases/p5-DBD-mysql/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/p5-DBD-mysql/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./databases/p5-DBD-mysql/Makefile	5 Feb 2006 23:08:32 -0000	1.34
+++ ./databases/p5-DBD-mysql/Makefile	4 Apr 2006 06:26:51 -0000
@@ -14,7 +14,7 @@
 
 DEPENDS+=		p5-Data-ShowTable>=3.3:../../devel/p5-Data-ShowTable
 
-BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.23.49nb1
+BUILDLINK_API_DEPENDS.mysql-client?=	mysql-client>=3.23.49nb1
 
 PERL5_PACKLIST=		auto/DBD/mysql/.packlist
 
Index: ./databases/p5-DBI/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/p5-DBI/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./databases/p5-DBI/buildlink3.mk	6 Aug 2005 06:19:06 -0000	1.9
+++ ./databases/p5-DBI/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	p5-DBI
 
 .if !empty(P5_DBI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.48nb1
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.48nb1
 BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
 BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLVENDORARCH}/auto/DBI
 
Index: ./databases/p5-DBI-Shell/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/p5-DBI-Shell/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./databases/p5-DBI-Shell/Makefile	6 Aug 2005 06:19:06 -0000	1.6
+++ ./databases/p5-DBI-Shell/Makefile	4 Apr 2006 06:26:51 -0000
@@ -19,7 +19,7 @@
 
 PERL5_PACKLIST=		auto/DBI/Shell/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.37
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
Index: ./databases/p5-DBIWrapper/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/p5-DBIWrapper/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./databases/p5-DBIWrapper/Makefile	5 Feb 2006 23:08:33 -0000	1.8
+++ ./databases/p5-DBIWrapper/Makefile	4 Apr 2006 06:26:51 -0000
@@ -20,7 +20,7 @@
 
 PERL5_PACKLIST=		auto/DBIWrapper/.packlist
 
-BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.37
+BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.37
 
 .include "../../databases/p5-DBI/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
Index: ./databases/php-pdo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/php-pdo/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/php-pdo/buildlink3.mk	5 Feb 2006 23:08:33 -0000	1.3
+++ ./databases/php-pdo/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=    php-pdo
 
 .if !empty(PHP_PDO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php-pdo+=        php-pdo-5.*
-BUILDLINK_RECOMMENDED.php-pdo?=      php-pdo>=5.1.1.1.0.2nb1
+BUILDLINK_API_DEPENDS.php-pdo+=        php-pdo-5.*
+BUILDLINK_ABI_DEPENDS.php-pdo?=      php-pdo>=5.1.1.1.0.2nb1
 BUILDLINK_PKGSRCDIR.php-pdo?=      ../../databases/php-pdo
 BUILDLINK_INCDIRS.php-pdo?=        include/php/ext/pdo
 .endif  # PHP_PDO_BUILDLINK3_MK
Index: ./databases/php-pdo_dblib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/php-pdo_dblib/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./databases/php-pdo_dblib/Makefile	5 Feb 2006 23:08:33 -0000	1.5
+++ ./databases/php-pdo_dblib/Makefile	4 Apr 2006 06:26:51 -0000
@@ -10,7 +10,7 @@
 CONFIGURE_ARGS+=	--with-${PKGMODNAME}=shared,${BUILDLINK_DIR}
 
 # requires 0.63 version to compile, doesn't compile with 0.61
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
 .include "../../databases/freetds/buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
Index: ./databases/postgresql73/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql73/Makefile.common,v
retrieving revision 1.16
diff -u -r1.16 Makefile.common
--- ./databases/postgresql73/Makefile.common	4 Mar 2006 21:29:10 -0000	1.16
+++ ./databases/postgresql73/Makefile.common	4 Apr 2006 06:26:51 -0000
@@ -36,8 +36,8 @@
 DIST_VERS?=		7.3.14
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
-BUILDLINK_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql73-lib?=	postgresql73-lib>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=${BASE_VERS}
 
 USE_TOOLS+=		autoconf gmake
 GNU_CONFIGURE=		YES
Index: ./databases/postgresql73-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql73-lib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./databases/postgresql73-lib/buildlink3.mk	5 Feb 2006 23:08:34 -0000	1.4
+++ ./databases/postgresql73-lib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	postgresql73-lib
 
 .if !empty(POSTGRESQL73_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql73-lib+=	postgresql73-lib>=7.3.10
-BUILDLINK_RECOMMENDED.postgresql73-lib?=	postgresql73-lib>=7.3.10nb2
+BUILDLINK_API_DEPENDS.postgresql73-lib+=	postgresql73-lib>=7.3.10
+BUILDLINK_ABI_DEPENDS.postgresql73-lib?=	postgresql73-lib>=7.3.10nb2
 BUILDLINK_PKGSRCDIR.postgresql73-lib?=	../../databases/postgresql73-lib
 BUILDLINK_INCDIRS.postgresql73-lib?=	include/postgresql
 BUILDLINK_FILES.postgresql73-lib+=	include/pgsql/*
Index: ./databases/postgresql74/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql74/Makefile.common,v
retrieving revision 1.32
diff -u -r1.32 Makefile.common
--- ./databases/postgresql74/Makefile.common	8 Mar 2006 02:29:06 -0000	1.32
+++ ./databases/postgresql74/Makefile.common	4 Apr 2006 06:26:51 -0000
@@ -38,8 +38,8 @@
 DIST_VERS?=		7.4.12
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
-#BUILDLINK_DEPENDS.tcl-postgresql74?=	tcl-postgresq74l>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql74-lib?=	postgresql74-lib>=${BASE_VERS}
+#BUILDLINK_API_DEPENDS.tcl-postgresql74?=	tcl-postgresq74l>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
Index: ./databases/postgresql74-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql74-lib/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./databases/postgresql74-lib/buildlink3.mk	5 Feb 2006 23:08:35 -0000	1.8
+++ ./databases/postgresql74-lib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	postgresql74-lib
 
 .if !empty(POSTGRESQL74_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql74-lib+=		postgresql{74,}-lib>=7.4.0
-BUILDLINK_RECOMMENDED.postgresql74-lib+=	postgresql74-lib>=7.4.8nb3
+BUILDLINK_API_DEPENDS.postgresql74-lib+=		postgresql{74,}-lib>=7.4.0
+BUILDLINK_ABI_DEPENDS.postgresql74-lib+=	postgresql74-lib>=7.4.8nb3
 BUILDLINK_PKGSRCDIR.postgresql74-lib?=	../../databases/postgresql74-lib
 BUILDLINK_INCDIRS.postgresql74-lib?=	include/postgresql
 
Index: ./databases/postgresql80/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql80/Makefile.common,v
retrieving revision 1.19
diff -u -r1.19 Makefile.common
--- ./databases/postgresql80/Makefile.common	14 Mar 2006 16:23:46 -0000	1.19
+++ ./databases/postgresql80/Makefile.common	4 Apr 2006 06:26:51 -0000
@@ -35,7 +35,7 @@
 DIST_VERS?=		8.0.7
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
Index: ./databases/postgresql80-client/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql80-client/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/postgresql80-client/buildlink3.mk	5 Feb 2006 23:08:35 -0000	1.3
+++ ./databases/postgresql80-client/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	postgresql80-client
 
 .if !empty(POSTGRESQL80_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql80-client+=		postgresql80-client>=8.0.2
-BUILDLINK_RECOMMENDED.postgresql80-client?=	postgresql80-client>=8.0.5nb1
+BUILDLINK_API_DEPENDS.postgresql80-client+=		postgresql80-client>=8.0.2
+BUILDLINK_ABI_DEPENDS.postgresql80-client?=	postgresql80-client>=8.0.5nb1
 BUILDLINK_PKGSRCDIR.postgresql80-client?=	../../databases/postgresql80-client
 
 .  if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
Index: ./databases/postgresql81/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql81/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- ./databases/postgresql81/Makefile.common	28 Mar 2006 19:48:22 -0000	1.3
+++ ./databases/postgresql81/Makefile.common	4 Apr 2006 06:26:51 -0000
@@ -35,7 +35,7 @@
 DIST_VERS?=		8.1.3
 BASE_VERS?=		${DIST_VERS}
 
-BUILDLINK_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
+BUILDLINK_API_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
 
 GNU_CONFIGURE=		yes
 BUILD_USES_MSGFMT=	yes
Index: ./databases/postgresql81-client/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/postgresql81-client/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/postgresql81-client/buildlink3.mk	21 Mar 2006 06:39:33 -0000	1.2
+++ ./databases/postgresql81-client/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	postgresql81-client
 
 .if !empty(POSTGRESQL81_CLIENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
+BUILDLINK_API_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
 BUILDLINK_PKGSRCDIR.postgresql81-client?=	../../databases/postgresql81-client
 
 .  if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
Index: ./databases/py-ZODB/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-ZODB/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./databases/py-ZODB/buildlink3.mk	5 Feb 2006 23:08:35 -0000	1.5
+++ ./databases/py-ZODB/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyZODB
 
 .if !empty(PY_ZODB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_RECOMMENDED.pyZODB?=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
+BUILDLINK_API_DEPENDS.pyZODB+=	${PYPKGPREFIX}-ZODB>=3.2nb1
+BUILDLINK_ABI_DEPENDS.pyZODB?=	${PYPKGPREFIX}-ZODB>=3.2.1nb2
 BUILDLINK_PKGSRCDIR.pyZODB?=	../../databases/py-ZODB
 .endif	# PY_ZODB_BUILDLINK3_MK
 
Index: ./databases/py-bsddb3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-bsddb3/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./databases/py-bsddb3/buildlink3.mk	5 Feb 2006 23:08:35 -0000	1.4
+++ ./databases/py-bsddb3/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -17,8 +17,8 @@
 BUILDLINK_PACKAGES+=	py-bsddb3
 
 .if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.3.3nb1
-BUILDLINK_RECOMMENDED.py-bsddb3?=	${PYPKGPREFIX}-bsddb3>=4.3.3nb2
+BUILDLINK_API_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.3.3nb1
+BUILDLINK_ABI_DEPENDS.py-bsddb3?=	${PYPKGPREFIX}-bsddb3>=4.3.3nb2
 BUILDLINK_PKGSRCDIR.py-bsddb3?=	../../databases/py-bsddb3
 .endif	# PY_BSDDB3_BUILDLINK3_MK
 
Index: ./databases/py-ldap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-ldap/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/py-ldap/buildlink3.mk	5 Feb 2006 23:08:36 -0000	1.3
+++ ./databases/py-ldap/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyldap
 
 .if !empty(PY_LDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.0.10nb1
-BUILDLINK_RECOMMENDED.pyldap?=	${PYPKGPREFIX}-ldap>=2.0.10nb2
+BUILDLINK_API_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.0.10nb1
+BUILDLINK_ABI_DEPENDS.pyldap?=	${PYPKGPREFIX}-ldap>=2.0.10nb2
 BUILDLINK_PKGSRCDIR.pyldap?=	../../databases/py-ldap
 .endif	# PY_LDAP_BUILDLINK3_MK
 
Index: ./databases/py-metakit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-metakit/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/py-metakit/buildlink3.mk	5 Feb 2006 23:08:36 -0000	1.2
+++ ./databases/py-metakit/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pymetakit
 
 .if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-*
-BUILDLINK_RECOMMENDED.pymetakit?=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
+BUILDLINK_API_DEPENDS.pymetakit+=	${PYPKGPREFIX}-metakit-*
+BUILDLINK_ABI_DEPENDS.pymetakit?=	${PYPKGPREFIX}-metakit>=2.4.9.3nb2
 BUILDLINK_PKGSRCDIR.pymetakit?=	../../databases/py-metakit
 .endif	# PY_METAKIT_BUILDLINK3_MK
 
Index: ./databases/py-mssql/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-mssql/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ./databases/py-mssql/Makefile	13 Mar 2006 12:52:03 -0000	1.3
+++ ./databases/py-mssql/Makefile	4 Apr 2006 06:26:51 -0000
@@ -10,7 +10,7 @@
 HOMEPAGE=		http://pymssql.sourceforge.net/
 COMMENT=		Python interface to MS SQL
 
-BUILDLINK_DEPENDS.freetds+=	freetds>=0.63
+BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.63
 
 PYTHON_VERSION_REQD=	24
 PYBINMODULE=		yes
Index: ./databases/py-psycopg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/py-psycopg/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/py-psycopg/buildlink3.mk	5 Feb 2006 23:08:36 -0000	1.3
+++ ./databases/py-psycopg/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	psycopg
 
 .if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
-BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
+BUILDLINK_API_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.1.21
+BUILDLINK_ABI_DEPENDS.psycopg?=	${PYPKGPREFIX}-psycopg>=1.1.21nb1
 BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
 .endif	# PY_PSYCOPG_BUILDLINK3_MK
 
Index: ./databases/qdbm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/qdbm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/qdbm/buildlink3.mk	11 Jan 2006 18:23:01 -0000	1.3
+++ ./databases/qdbm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	qdbm
 
 .if !empty(QDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qdbm+=	qdbm>=1.8.40
+BUILDLINK_API_DEPENDS.qdbm+=	qdbm>=1.8.40
 BUILDLINK_PKGSRCDIR.qdbm?=	../../databases/qdbm
 .endif	# QDBM_BUILDLINK3_MK
 
Index: ./databases/rrdtool/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/rrdtool/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./databases/rrdtool/buildlink3.mk	5 Feb 2006 23:08:37 -0000	1.9
+++ ./databases/rrdtool/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rrdtool
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.2.9
-BUILDLINK_RECOMMENDED.rrdtool+=	rrdtool>=1.2.12nb1
+BUILDLINK_API_DEPENDS.rrdtool+=	rrdtool>=1.2.9
+BUILDLINK_ABI_DEPENDS.rrdtool+=	rrdtool>=1.2.12nb1
 BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 .endif	# RRDTOOL_BUILDLINK3_MK
 
Index: ./databases/sdbm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sdbm/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./databases/sdbm/buildlink3.mk	5 Apr 2005 10:24:41 -0000	1.1
+++ ./databases/sdbm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	sdbm
 
 .if !empty(SDBM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sdbm+=	sdbm>=90.12.1
+BUILDLINK_API_DEPENDS.sdbm+=	sdbm>=90.12.1
 BUILDLINK_PKGSRCDIR.sdbm?=	../../databases/sdbm
 .endif	# SDBM_BUILDLINK3_MK
 
Index: ./databases/shared-mime-info/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/shared-mime-info/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/shared-mime-info/buildlink3.mk	5 Feb 2006 23:08:37 -0000	1.3
+++ ./databases/shared-mime-info/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	shared-mime-info
 
 .if !empty(SHARED_MIME_INFO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
-BUILDLINK_RECOMMENDED.shared-mime-info?=	shared-mime-info>=0.16nb2
+BUILDLINK_API_DEPENDS.shared-mime-info+=	shared-mime-info>=0.15
+BUILDLINK_ABI_DEPENDS.shared-mime-info?=	shared-mime-info>=0.16nb2
 BUILDLINK_PKGSRCDIR.shared-mime-info?=	../../databases/shared-mime-info
 .endif	# SHARED_MIME_INFO_BUILDLINK3_MK
 
Index: ./databases/sqlite/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlite/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/sqlite/buildlink3.mk	5 Feb 2006 23:08:37 -0000	1.3
+++ ./databases/sqlite/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sqlite
 
 .if !empty(SQLITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite+=	sqlite>=2.8.0
-BUILDLINK_RECOMMENDED.sqlite+=	sqlite>=2.8.16nb1
+BUILDLINK_API_DEPENDS.sqlite+=	sqlite>=2.8.0
+BUILDLINK_ABI_DEPENDS.sqlite+=	sqlite>=2.8.16nb1
 BUILDLINK_PKGSRCDIR.sqlite?=	../../databases/sqlite
 .endif	# SQLITE_BUILDLINK3_MK
 
Index: ./databases/sqlite3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlite3/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/sqlite3/buildlink3.mk	5 Feb 2006 23:08:37 -0000	1.2
+++ ./databases/sqlite3/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sqlite3
 
 .if !empty(SQLITE3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sqlite3+=	sqlite3>=3.0.8
-BUILDLINK_RECOMMENDED.sqlite3?=	sqlite3>=3.2.7nb1
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.0.8
+BUILDLINK_ABI_DEPENDS.sqlite3?=	sqlite3>=3.2.7nb1
 BUILDLINK_PKGSRCDIR.sqlite3?=	../../databases/sqlite3
 .endif	# SQLITE3_BUILDLINK3_MK
 
Index: ./databases/sqlite3-tcl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlite3-tcl/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./databases/sqlite3-tcl/Makefile	15 Feb 2006 19:50:52 -0000	1.4
+++ ./databases/sqlite3-tcl/Makefile	4 Apr 2006 06:26:51 -0000
@@ -10,7 +10,7 @@
 INSTALL_TARGET=		tcl_install
 TEST_TARGET=		test
 
-BUILDLINK_DEPENDS.sqlite3+=	sqlite3>=3.2.7
+BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.2.7
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
Index: ./databases/tdb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tdb/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./databases/tdb/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.4
+++ ./databases/tdb/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tdb
 
 .if !empty(TDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tdb+=		tdb>=1.0.6
-BUILDLINK_RECOMMENDED.tdb+=	tdb>=1.0.6nb2
+BUILDLINK_API_DEPENDS.tdb+=		tdb>=1.0.6
+BUILDLINK_ABI_DEPENDS.tdb+=	tdb>=1.0.6nb2
 BUILDLINK_PKGSRCDIR.tdb?=	../../databases/tdb
 .endif	# TDB_BUILDLINK3_MK
 
Index: ./databases/tcl-postgresql73/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tcl-postgresql73/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./databases/tcl-postgresql73/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.4
+++ ./databases/tcl-postgresql73/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-postgresql73
 
 .if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?=	tcl-postgresql73>=7.3.10nb2
+BUILDLINK_API_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?=	tcl-postgresql73>=7.3.10nb2
 BUILDLINK_PKGSRCDIR.tcl-postgresql73?=	../../databases/tcl-postgresql73
 .endif	# TCL_POSTGRESQL73_BUILDLINK3_MK
 
Index: ./databases/tcl-postgresql74/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tcl-postgresql74/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./databases/tcl-postgresql74/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.2
+++ ./databases/tcl-postgresql74/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-postgresql73
 
 .if !empty(TCL_POSTGRESQL73_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
-BUILDLINK_RECOMMENDED.tcl-postgresql73?=	tcl-postgresql74>=7.4.8nb1
+BUILDLINK_API_DEPENDS.tcl-postgresql73+=	tcl-postgresql73>=7.3.6
+BUILDLINK_ABI_DEPENDS.tcl-postgresql73?=	tcl-postgresql74>=7.4.8nb1
 BUILDLINK_PKGSRCDIR.tcl-postgresql73?=	../../databases/tcl-postgresql73
 .endif	# TCL_POSTGRESQL73_BUILDLINK3_MK
 
Index: ./databases/tinycdb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/tinycdb/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./databases/tinycdb/buildlink3.mk	19 Jan 2006 04:40:36 -0000	1.1
+++ ./databases/tinycdb/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	tinycdb
 
 .if !empty(TINYCDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tinycdb+=	tinycdb>=0.75
+BUILDLINK_API_DEPENDS.tinycdb+=	tinycdb>=0.75
 BUILDLINK_DEPMETHOD.tinycdb?=	build
 BUILDLINK_PKGSRCDIR.tinycdb?=	../../databases/tinycdb
 .endif	# TINYCDB_BUILDLINK3_MK
Index: ./databases/unixodbc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/unixodbc/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./databases/unixodbc/buildlink3.mk	15 Oct 2004 11:54:10 -0000	1.3
+++ ./databases/unixodbc/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	unixodbc
 
 .if !empty(UNIXODBC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1
-BUILDLINK_RECOMMENDED.unixodbc+=	unixodbc>=2.0.11nb3
+BUILDLINK_API_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb1
+BUILDLINK_ABI_DEPENDS.unixodbc+=	unixodbc>=2.0.11nb3
 BUILDLINK_PKGSRCDIR.unixodbc?=	../../databases/unixodbc
 .endif	# UNIXODBC_BUILDLINK3_MK
 
Index: ./devel/GConf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/GConf/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.6
+++ ./devel/GConf/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	GConf
 
 .if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb7
-BUILDLINK_RECOMMENDED.GConf?=	GConf>=1.0.9nb8
+BUILDLINK_API_DEPENDS.GConf+=	GConf>=1.0.9nb7
+BUILDLINK_ABI_DEPENDS.GConf?=	GConf>=1.0.9nb8
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .endif	# GCONF_BUILDLINK3_MK
 
Index: ./devel/GConf2/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2/Makefile.common,v
retrieving revision 1.36
diff -u -r1.36 Makefile.common
--- ./devel/GConf2/Makefile.common	31 Dec 2005 00:05:11 -0000	1.36
+++ ./devel/GConf2/Makefile.common	4 Apr 2006 06:26:51 -0000
@@ -34,7 +34,7 @@
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
Index: ./devel/GConf2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/GConf2/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.7
+++ ./devel/GConf2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	GConf2
 
 .if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2?=	GConf2>=2.12.1nb1
+BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2?=	GConf2>=2.12.1nb1
 BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
 .endif	# GCONF2_BUILDLINK3_MK
 
Index: ./devel/GConf2-ui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2-ui/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./devel/GConf2-ui/Makefile	5 Feb 2006 23:08:38 -0000	1.24
+++ ./devel/GConf2-ui/Makefile	4 Apr 2006 06:26:51 -0000
@@ -6,7 +6,7 @@
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
 PKGREVISION=	2
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.12.1
+BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.12.1
 
 CONFIGURE_ARGS+=	--enable-gtk
 
Index: ./devel/GConf2-ui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2-ui/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/GConf2-ui/buildlink3.mk	5 Feb 2006 23:08:38 -0000	1.7
+++ ./devel/GConf2-ui/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	GConf2-ui
 
 .if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2-ui+=	GConf2-ui>=2.8.0.1
-BUILDLINK_RECOMMENDED.GConf2-ui?=	GConf2-ui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.GConf2-ui+=	GConf2-ui>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf2-ui?=	GConf2-ui>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.GConf2-ui?=	../../devel/GConf2-ui
 .endif	# GCONF2_UI_BUILDLINK3_MK
 
Index: ./devel/Gorm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/Gorm/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- ./devel/Gorm/Makefile	5 Feb 2006 23:08:38 -0000	1.32
+++ ./devel/Gorm/Makefile	4 Apr 2006 06:26:51 -0000
@@ -9,8 +9,8 @@
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	Graphical user interface builder for GNUstep
 
-BUILDLINK_DEPENDS.gnustep-base+=	gnustep-base>=1.11.1
-BUILDLINK_DEPENDS.gnustep-gui+=		gnustep-gui>=0.10.1
+BUILDLINK_API_DEPENDS.gnustep-base+=	gnustep-base>=1.11.1
+BUILDLINK_API_DEPENDS.gnustep-gui+=		gnustep-gui>=0.10.1
 
 NO_CONFIGURE=	yes
 
Index: ./devel/Renaissance/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/Renaissance/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/Renaissance/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.4
+++ ./devel/Renaissance/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Renaissance
 
 .if !empty(RENAISSANCE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Renaissance+=		Renaissance>=0.7.0
-BUILDLINK_RECOMMENDED.Renaissance+=	Renaissance>=0.8.0nb4
+BUILDLINK_API_DEPENDS.Renaissance+=		Renaissance>=0.7.0
+BUILDLINK_ABI_DEPENDS.Renaissance+=	Renaissance>=0.8.0nb4
 BUILDLINK_PKGSRCDIR.Renaissance?=	../../devel/Renaissance
 .endif	# RENAISSANCE_BUILDLINK3_MK
 
Index: ./devel/SDL/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./devel/SDL/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.14
+++ ./devel/SDL/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL
 
 .if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.5nb5
-BUILDLINK_RECOMMENDED.SDL+=	SDL>=1.2.9nb2
+BUILDLINK_API_DEPENDS.SDL+=		SDL>=1.2.5nb5
+BUILDLINK_ABI_DEPENDS.SDL+=	SDL>=1.2.9nb2
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
 .endif	# SDL_BUILDLINK3_MK
 
Index: ./devel/SDL_gfx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL_gfx/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/SDL_gfx/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.4
+++ ./devel/SDL_gfx/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL_gfx
 
 .if !empty(SDL_GFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
-BUILDLINK_RECOMMENDED.SDL_gfx?=	SDL_gfx>=2.0.13nb3
+BUILDLINK_API_DEPENDS.SDL_gfx+=	SDL_gfx>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.SDL_gfx?=	SDL_gfx>=2.0.13nb3
 BUILDLINK_PKGSRCDIR.SDL_gfx?=	../../devel/SDL_gfx
 .endif	# SDL_GFX_BUILDLINK3_MK
 
Index: ./devel/SDL_ttf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDL_ttf/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/SDL_ttf/buildlink3.mk	6 Feb 2006 23:16:07 -0000	1.5
+++ ./devel/SDL_ttf/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL_ttf
 
 .if !empty(SDL_TTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
-BUILDLINK_RECOMMENDED.SDL_ttf?=	SDL_ttf>=2.0.7nb3
+BUILDLINK_API_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.3nb3
+BUILDLINK_ABI_DEPENDS.SDL_ttf?=	SDL_ttf>=2.0.7nb3
 BUILDLINK_PKGSRCDIR.SDL_ttf?=	../../devel/SDL_ttf
 .endif	# SDL_TTF_BUILDLINK3_MK
 
Index: ./devel/SDLmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/SDLmm/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/SDLmm/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.4
+++ ./devel/SDLmm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDLmm
 
 .if !empty(SDLMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
-BUILDLINK_RECOMMENDED.SDLmm?=	SDLmm>=0.1.8nb5
+BUILDLINK_API_DEPENDS.SDLmm+=	SDLmm>=0.1.8nb1
+BUILDLINK_ABI_DEPENDS.SDLmm?=	SDLmm>=0.1.8nb5
 BUILDLINK_PKGSRCDIR.SDLmm?=	../../devel/SDLmm
 .endif	# SDLMM_BUILDLINK3_MK
 
Index: ./devel/allegro/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/allegro/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/allegro/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.4
+++ ./devel/allegro/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	allegro
 
 .if !empty(ALLEGRO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.allegro+=	allegro>=4.1.13
-BUILDLINK_RECOMMENDED.allegro?=	allegro>=4.2.0nb1
+BUILDLINK_API_DEPENDS.allegro+=	allegro>=4.1.13
+BUILDLINK_ABI_DEPENDS.allegro?=	allegro>=4.2.0nb1
 BUILDLINK_PKGSRCDIR.allegro?=	../../devel/allegro
 .endif	# ALLEGRO_BUILDLINK3_MK
 
Index: ./devel/apr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/apr/buildlink3.mk,v
retrieving revision 1.20
diff -u -r1.20 buildlink3.mk
--- ./devel/apr/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.20
+++ ./devel/apr/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	apr
 
 .if !empty(APR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apr+=	apr>=0.9.5.2.0.51nb1
-BUILDLINK_RECOMMENDED.apr+=	apr>=0.9.7.2.0.55nb2
+BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.5.2.0.51nb1
+BUILDLINK_ABI_DEPENDS.apr+=	apr>=0.9.7.2.0.55nb2
 BUILDLINK_PKGSRCDIR.apr?=	../../devel/apr
 
 WRAPPER_REORDER_CMDS+=	reorder:l:aprutil-0:crypt
Index: ./devel/at-spi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/at-spi/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./devel/at-spi/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.9
+++ ./devel/at-spi/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	at-spi
 
 .if !empty(AT_SPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.at-spi+=	at-spi>=1.6.0
-BUILDLINK_RECOMMENDED.at-spi+=	at-spi>=1.6.6nb2
+BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.6.0
+BUILDLINK_ABI_DEPENDS.at-spi+=	at-spi>=1.6.6nb2
 BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 .endif	# AT_SPI_BUILDLINK3_MK
 
Index: ./devel/atk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- ./devel/atk/Makefile	10 Mar 2006 07:35:12 -0000	1.45
+++ ./devel/atk/Makefile	4 Apr 2006 06:26:51 -0000
@@ -28,7 +28,7 @@
 # glib-mkenums overflows a 2048kb stack on atkobject.h
 UNLIMIT_RESOURCES=	stacksize
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./devel/atk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/atk/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.8
+++ ./devel/atk/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	atk
 
 .if !empty(ATK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.atk+=		atk>=1.8.0
-BUILDLINK_RECOMMENDED.atk+=	atk>=1.10.3nb1
+BUILDLINK_API_DEPENDS.atk+=		atk>=1.8.0
+BUILDLINK_ABI_DEPENDS.atk+=	atk>=1.10.3nb1
 BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
 .endif	# ATK_BUILDLINK3_MK
 
Index: ./devel/bglibs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bglibs/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/bglibs/buildlink3.mk	20 Feb 2006 02:59:52 -0000	1.5
+++ ./devel/bglibs/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	bglibs
 
 .if !empty(BGLIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bglibs+=	bglibs>=1.040
+BUILDLINK_API_DEPENDS.bglibs+=	bglibs>=1.040
 BUILDLINK_PKGSRCDIR.bglibs?=	../../devel/bglibs
 BUILDLINK_DEPMETHOD.bglibs?=	build
 .endif	# BGLIBS_BUILDLINK3_MK
Index: ./devel/binutils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/binutils/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./devel/binutils/buildlink3.mk	30 Jun 2004 16:18:03 -0000	1.15
+++ ./devel/binutils/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	binutils
 
 .if !empty(BINUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.binutils+=		binutils>=2.15.0
+BUILDLINK_API_DEPENDS.binutils+=		binutils>=2.15.0
 BUILDLINK_PKGSRCDIR.binutils?=		../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=		build
 .endif	# BINUTILS_BUILDLINK3_MK
Index: ./devel/binutils/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/binutils/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./devel/binutils/builtin.mk	1 Jun 2005 18:02:43 -0000	1.3
+++ ./devel/binutils/builtin.mk	4 Apr 2006 06:26:51 -0000
@@ -22,7 +22,7 @@
 .    if defined(BUILTIN_PKG.binutils) && \
         !empty(IS_BUILTIN.binutils:M[yY][eE][sS])
 USE_BUILTIN.binutils=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.binutils}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.binutils}
 .        if !empty(USE_BUILTIN.binutils:M[yY][eE][sS])
 USE_BUILTIN.binutils!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.binutils:Q}; then \
Index: ./devel/blib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/blib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/blib/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.4
+++ ./devel/blib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	blib
 
 .if !empty(BLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blib+=	blib>=1.0.2nb1
-BUILDLINK_RECOMMENDED.blib+=	blib>=1.0.2nb4
+BUILDLINK_API_DEPENDS.blib+=	blib>=1.0.2nb1
+BUILDLINK_ABI_DEPENDS.blib+=	blib>=1.0.2nb4
 BUILDLINK_PKGSRCDIR.blib?=	../../devel/blib
 .endif	# BLIB_BUILDLINK3_MK
 
Index: ./devel/boehm-gc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boehm-gc/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/boehm-gc/buildlink3.mk	5 Feb 2006 23:08:39 -0000	1.8
+++ ./devel/boehm-gc/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	boehm-gc
 
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
-BUILDLINK_RECOMMENDED.boehm-gc+=	boehm-gc>=6.6nb1
+BUILDLINK_API_DEPENDS.boehm-gc+=	boehm-gc>=6.3nb1
+BUILDLINK_ABI_DEPENDS.boehm-gc+=	boehm-gc>=6.6nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
 
Index: ./devel/bonobo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bonobo/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- ./devel/bonobo/Makefile	4 Mar 2006 21:29:12 -0000	1.55
+++ ./devel/bonobo/Makefile	4 Apr 2006 06:26:51 -0000
@@ -12,7 +12,7 @@
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
-BUILDLINK_DEPENDS.libxml=	libxml>1.8.15
+BUILDLINK_API_DEPENDS.libxml=	libxml>1.8.15
 
 BROKEN_GETTEXT_DETECTION=	yes
 BUILD_USES_MSGFMT=	yes
Index: ./devel/bonobo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/bonobo/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/bonobo/buildlink3.mk	5 Feb 2006 23:08:40 -0000	1.3
+++ ./devel/bonobo/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	bonobo
 
 .if !empty(BONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bonobo+=	bonobo>=1.0.18nb7
-BUILDLINK_RECOMMENDED.bonobo+=	bonobo>=1.0.22nb1
+BUILDLINK_API_DEPENDS.bonobo+=	bonobo>=1.0.18nb7
+BUILDLINK_ABI_DEPENDS.bonobo+=	bonobo>=1.0.22nb1
 BUILDLINK_PKGSRCDIR.bonobo?=	../../devel/bonobo
 .endif	# BONOBO_BUILDLINK3_MK
 
Index: ./devel/boost-build/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boost-build/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/boost-build/buildlink3.mk	22 Sep 2005 22:06:08 -0000	1.3
+++ ./devel/boost-build/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	boost-build
 
 .if !empty(BOOST_BUILD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boost-build+=		boost-build-1.33.*
+BUILDLINK_API_DEPENDS.boost-build+=		boost-build-1.33.*
 BUILDLINK_DEPMETHOD.boost-build?=	build
 BUILDLINK_PKGSRCDIR.boost-build?=	../../devel/boost-build
 .endif	# BOOST_BUILD_BUILDLINK3_MK
Index: ./devel/boost-headers/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boost-headers/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/boost-headers/buildlink3.mk	12 Aug 2005 20:58:45 -0000	1.4
+++ ./devel/boost-headers/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(BOOST_HEADERS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-headers+=	boost-headers-1.33.*
+BUILDLINK_API_DEPENDS.boost-headers+=	boost-headers-1.33.*
 BUILDLINK_DEPMETHOD.boost-headers?=	build
 BUILDLINK_PKGSRCDIR.boost-headers?=	../../devel/boost-headers
 .endif	# BOOST_HEADERS_BUILDLINK3_MK
Index: ./devel/boost-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boost-libs/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/boost-libs/buildlink3.mk	12 Aug 2005 20:58:45 -0000	1.4
+++ ./devel/boost-libs/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(BOOST_LIBS_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-libs+=		boost-libs-1.33.*
+BUILDLINK_API_DEPENDS.boost-libs+=		boost-libs-1.33.*
 BUILDLINK_PKGSRCDIR.boost-libs?=	../../devel/boost-libs
 .endif	# BOOST_LIBS_BUILDLINK3_MK
 
Index: ./devel/boost-python/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boost-python/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/boost-python/buildlink3.mk	5 Feb 2006 23:08:40 -0000	1.6
+++ ./devel/boost-python/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -12,8 +12,8 @@
 
 .if !empty(BOOST_PYTHON_BUILDLINK3_MK:M+)
 # Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_DEPENDS.boost-python+=	boost-python-1.33.*
-BUILDLINK_RECOMMENDED.boost-python?=	boost-python>=1.33.1nb1
+BUILDLINK_API_DEPENDS.boost-python+=	boost-python-1.33.*
+BUILDLINK_ABI_DEPENDS.boost-python?=	boost-python>=1.33.1nb1
 BUILDLINK_PKGSRCDIR.boost-python?=	../../devel/boost-python
 
 .include "../../devel/boost-headers/buildlink3.mk"
Index: ./devel/buddy/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/buddy/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/buddy/buildlink3.mk	14 Mar 2006 20:23:07 -0000	1.2
+++ ./devel/buddy/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	buddy
 
 .if !empty(BUDDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buddy+=	buddy>=2.4
+BUILDLINK_API_DEPENDS.buddy+=	buddy>=2.4
 BUILDLINK_PKGSRCDIR.buddy?=	../../devel/buddy
 .endif	# BUDDY_BUILDLINK3_MK
 
Index: ./devel/buildtool/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/buildtool/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/buildtool/buildlink3.mk	5 Dec 2005 23:55:05 -0000	1.7
+++ ./devel/buildtool/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	buildtool
 
 .if !empty(BUILDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.buildtool+=	buildtool>=0.16
+BUILDLINK_API_DEPENDS.buildtool+=	buildtool>=0.16
 BUILDLINK_PKGSRCDIR.buildtool?=	../../devel/buildtool
 BUILDLINK_DEPMETHOD.buildtool?=	build
 
Index: ./devel/cdk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cdk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/cdk/buildlink3.mk	3 Oct 2004 00:13:25 -0000	1.2
+++ ./devel/cdk/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cdk
 
 .if !empty(CDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdk+=		cdk>=4.9.9nb1
-BUILDLINK_RECOMMENDED.cdk+=	cdk>=4.9.9nb2
+BUILDLINK_API_DEPENDS.cdk+=		cdk>=4.9.9nb1
+BUILDLINK_ABI_DEPENDS.cdk+=	cdk>=4.9.9nb2
 BUILDLINK_PKGSRCDIR.cdk?=	../../devel/cdk
 .endif	# CDK_BUILDLINK3_MK
 
Index: ./devel/cdk/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cdk/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./devel/cdk/builtin.mk	1 Jun 2005 18:02:43 -0000	1.2
+++ ./devel/cdk/builtin.mk	4 Apr 2006 06:26:51 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.cdk) && \
         !empty(IS_BUILTIN.cdk:M[yY][eE][sS])
 USE_BUILTIN.cdk=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.cdk}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.cdk}
 .        if !empty(USE_BUILTIN.cdk:M[yY][eE][sS])
 USE_BUILTIN.cdk!=							\
         if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.cdk:Q}; then	\
Index: ./devel/chmlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/chmlib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/chmlib/buildlink3.mk	5 Feb 2006 23:08:40 -0000	1.5
+++ ./devel/chmlib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	chmlib
 
 .if !empty(CHMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chmlib+=	chmlib>=0.31
-BUILDLINK_RECOMMENDED.chmlib+=	chmlib>=0.37.4nb2
+BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.31
+BUILDLINK_ABI_DEPENDS.chmlib+=	chmlib>=0.37.4nb2
 BUILDLINK_PKGSRCDIR.chmlib?=	../../devel/chmlib
 .endif	# CHMLIB_BUILDLINK3_MK
 
Index: ./devel/cmake/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cmake/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/cmake/buildlink3.mk	5 Feb 2006 23:08:40 -0000	1.2
+++ ./devel/cmake/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cmake
 
 .if !empty(CMAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cmake+=	cmake>=2.0.2
-BUILDLINK_RECOMMENDED.cmake?=	cmake>=2.0.5nb2
+BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.0.2
+BUILDLINK_ABI_DEPENDS.cmake?=	cmake>=2.0.5nb2
 BUILDLINK_PKGSRCDIR.cmake?=	../../devel/cmake
 BUILDLINK_DEPMETHOD.cmake?=	build
 .endif	# CMAKE_BUILDLINK3_MK
Index: ./devel/cppunit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/cppunit/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/cppunit/buildlink3.mk	5 Feb 2006 23:08:40 -0000	1.3
+++ ./devel/cppunit/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cppunit
 
 .if !empty(CPPUNIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cppunit+=	cppunit>=1.10.2
-BUILDLINK_RECOMMENDED.cppunit?=	cppunit>=1.10.2nb5
+BUILDLINK_API_DEPENDS.cppunit+=	cppunit>=1.10.2
+BUILDLINK_ABI_DEPENDS.cppunit?=	cppunit>=1.10.2nb5
 BUILDLINK_PKGSRCDIR.cppunit?=	../../devel/cppunit
 BUILDLINK_CPPFLAGS.cppunit+=	-I${BUILDLINK_PREFIX.cppunit}/include/cppunit
 .endif	# CPPUNIT_BUILDLINK3_MK
Index: ./devel/darts/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/darts/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/darts/buildlink3.mk	8 May 2004 21:34:43 -0000	1.2
+++ ./devel/darts/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	darts
 
 .if !empty(DARTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.darts+=	darts>=0.2
+BUILDLINK_API_DEPENDS.darts+=	darts>=0.2
 BUILDLINK_PKGSRCDIR.darts?=	../../devel/darts
 .endif	# DARTS_BUILDLINK3_MK
 
Index: ./devel/devIL/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/devIL/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/devIL/buildlink3.mk	5 Feb 2006 23:08:41 -0000	1.7
+++ ./devel/devIL/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	devIL
 
 .if !empty(DEVIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.devIL+=	devIL>=1.6.6nb1
-BUILDLINK_RECOMMENDED.devIL+=	devIL>=1.6.6nb6
+BUILDLINK_API_DEPENDS.devIL+=	devIL>=1.6.6nb1
+BUILDLINK_ABI_DEPENDS.devIL+=	devIL>=1.6.6nb6
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .endif	# DEVIL_BUILDLINK3_MK
 
Index: ./devel/dlcompat/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/dlcompat/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/dlcompat/buildlink3.mk	26 Nov 2004 09:39:30 -0000	1.7
+++ ./devel/dlcompat/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	dlcompat
 
 .if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dlcompat+=	dlcompat>=20030629
+BUILDLINK_API_DEPENDS.dlcompat+=	dlcompat>=20030629
 BUILDLINK_PKGSRCDIR.dlcompat?=	../../devel/dlcompat
 .endif  # DLCOMPAT_BUILDLINK3_MK
 
Index: ./devel/dlcompat/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/dlcompat/builtin.mk,v
retrieving revision 1.7
diff -u -r1.7 builtin.mk
--- ./devel/dlcompat/builtin.mk	1 Jun 2005 20:35:41 -0000	1.7
+++ ./devel/dlcompat/builtin.mk	4 Apr 2006 06:26:51 -0000
@@ -46,7 +46,7 @@
 .    if defined(BUILTIN_PKG.dlcompat) && \
         !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS])
 USE_BUILTIN.dlcompat=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.dlcompat}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.dlcompat}
 .        if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS])
 USE_BUILTIN.dlcompat!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dlcompat:Q}; then \
Index: ./devel/dmalloc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/dmalloc/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/dmalloc/buildlink3.mk	27 Apr 2004 03:09:58 -0000	1.1
+++ ./devel/dmalloc/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	dmalloc
 
 .if !empty(DMALLOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dmalloc+=	dmalloc>=4.8.2nb2
+BUILDLINK_API_DEPENDS.dmalloc+=	dmalloc>=4.8.2nb2
 BUILDLINK_PKGSRCDIR.dmalloc?=	../../devel/dmalloc
 BUILDLINK_DEPMETHOD.dmalloc?=	build
 .endif	# DMALLOC_BUILDLINK3_MK
Index: ./devel/edcommon/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/edcommon/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/edcommon/buildlink3.mk	5 Feb 2006 23:08:41 -0000	1.3
+++ ./devel/edcommon/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	edcommon
 
 .if !empty(EDCOMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.edcommon+=	edcommon>=32
-BUILDLINK_RECOMMENDED.edcommon?=	edcommon>=32nb2
+BUILDLINK_API_DEPENDS.edcommon+=	edcommon>=32
+BUILDLINK_ABI_DEPENDS.edcommon?=	edcommon>=32nb2
 BUILDLINK_PKGSRCDIR.edcommon?=	../../devel/edcommon
 .endif	# EDCOMMON_BUILDLINK3_MK
 
Index: ./devel/eel2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/eel2/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./devel/eel2/buildlink3.mk	5 Feb 2006 23:08:41 -0000	1.12
+++ ./devel/eel2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	eel2
 
 .if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eel2+=	eel2>=2.10.0
-BUILDLINK_RECOMMENDED.eel2?=	eel2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.10.0
+BUILDLINK_ABI_DEPENDS.eel2?=	eel2>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
 .endif	# EEL2_BUILDLINK3_MK
 
Index: ./devel/eet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/eet/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/eet/buildlink3.mk	15 Oct 2004 11:31:48 -0000	1.3
+++ ./devel/eet/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	eet
 
 .if !empty(EET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eet+=	eet>=0.9.9
+BUILDLINK_API_DEPENDS.eet+=	eet>=0.9.9
 BUILDLINK_PKGSRCDIR.eet?=	../../devel/eet
 .endif	# EET_BUILDLINK3_MK
 
Index: ./devel/ffcall/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ffcall/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/ffcall/buildlink3.mk	3 Oct 2004 00:13:26 -0000	1.3
+++ ./devel/ffcall/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ffcall
 
 .if !empty(FFCALL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffcall+=	ffcall>=1.9
-BUILDLINK_RECOMMENDED.ffcall+=	ffcall>=1.10nb1
+BUILDLINK_API_DEPENDS.ffcall+=	ffcall>=1.9
+BUILDLINK_ABI_DEPENDS.ffcall+=	ffcall>=1.10nb1
 BUILDLINK_PKGSRCDIR.ffcall?=	../../devel/ffcall
 .endif	# FFCALL_BUILDLINK3_MK
 
Index: ./devel/flex/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/flex/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/flex/buildlink3.mk	27 Apr 2004 21:00:14 -0000	1.1
+++ ./devel/flex/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -12,7 +12,7 @@
 BUILDLINK_PACKAGES+=	flex
 
 .if !empty(FLEX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.flex+=	flex>=2.5.4a
+BUILDLINK_API_DEPENDS.flex+=	flex>=2.5.4a
 BUILDLINK_PKGSRCDIR.flex?=	../../devel/flex
 BUILDLINK_DEPMETHOD.flex?=	build
 .endif	# FLEX_BUILDLINK3_MK
Index: ./devel/florist/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/florist/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/florist/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.4
+++ ./devel/florist/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	florist
 
 .if !empty(FLORIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.florist+=	florist>=3.15p
-BUILDLINK_RECOMMENDED.florist?=	florist>=3.15pnb2
+BUILDLINK_API_DEPENDS.florist+=	florist>=3.15p
+BUILDLINK_ABI_DEPENDS.florist?=	florist>=3.15pnb2
 BUILDLINK_PKGSRCDIR.florist?=	../../devel/florist
 .endif	# FLORIST_BUILDLINK3_MK
 
Index: ./devel/g-wrap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/g-wrap/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.6
+++ ./devel/g-wrap/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.9.5
-BUILDLINK_RECOMMENDED.g-wrap?=	g-wrap>=1.9.6nb1
+BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap>=1.9.5
+BUILDLINK_ABI_DEPENDS.g-wrap?=	g-wrap>=1.9.6nb1
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap
 .endif	# G_WRAP_BUILDLINK3_MK
 
Index: ./devel/g-wrap1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/g-wrap1/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/g-wrap1/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.3
+++ ./devel/g-wrap1/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	g-wrap
 
 .if !empty(G_WRAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb6
-BUILDLINK_DEPENDS.g-wrap+=	g-wrap<1.4
-BUILDLINK_RECOMMENDED.g-wrap?=	g-wrap>=1.3.4nb7
+BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap>=1.3.4nb6
+BUILDLINK_API_DEPENDS.g-wrap+=	g-wrap<1.4
+BUILDLINK_ABI_DEPENDS.g-wrap?=	g-wrap>=1.3.4nb7
 BUILDLINK_PKGSRCDIR.g-wrap?=	../../devel/g-wrap1
 .endif	# G_WRAP_BUILDLINK3_MK
 
Index: ./devel/gail/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gail/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/gail/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.8
+++ ./devel/gail/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gail
 
 .if !empty(GAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gail+=	gail>=1.8.0
-BUILDLINK_RECOMMENDED.gail+=	gail>=1.8.8nb2
+BUILDLINK_API_DEPENDS.gail+=	gail>=1.8.0
+BUILDLINK_ABI_DEPENDS.gail+=	gail>=1.8.8nb2
 BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
 .endif	# GAIL_BUILDLINK3_MK
 
Index: ./devel/gal/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gal/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/gal/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.5
+++ ./devel/gal/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gal
 
 .if !empty(GAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal+=	gal>=0.22nb6
-BUILDLINK_RECOMMENDED.gal?=	gal>=0.24nb2
+BUILDLINK_API_DEPENDS.gal+=	gal>=0.22nb6
+BUILDLINK_ABI_DEPENDS.gal?=	gal>=0.24nb2
 BUILDLINK_PKGSRCDIR.gal?=	../../devel/gal
 .endif	# GAL_BUILDLINK3_MK
 
Index: ./devel/gal2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gal2/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./devel/gal2/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.11
+++ ./devel/gal2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	gal2
 
 .if !empty(GAL2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal2+=	gal2>=2.4.0
-BUILDLINK_DEPENDS.gal2+=	gal2<2.5.0
-BUILDLINK_RECOMMENDED.gal2?=	gal2>=2.4.3nb3
+BUILDLINK_API_DEPENDS.gal2+=	gal2>=2.4.0
+BUILDLINK_API_DEPENDS.gal2+=	gal2<2.5.0
+BUILDLINK_ABI_DEPENDS.gal2?=	gal2>=2.4.3nb3
 BUILDLINK_PKGSRCDIR.gal2?=	../../devel/gal2
 .endif	# GAL2_BUILDLINK3_MK
 
Index: ./devel/gal20/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gal20/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/gal20/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.4
+++ ./devel/gal20/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gal20
 
 .if !empty(GAL20_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gal20+=	gal20>=1.99.11
-BUILDLINK_RECOMMENDED.gal20?=	gal20>=1.99.11nb5
+BUILDLINK_API_DEPENDS.gal20+=	gal20>=1.99.11
+BUILDLINK_ABI_DEPENDS.gal20?=	gal20>=1.99.11nb5
 BUILDLINK_PKGSRCDIR.gal20?=	../../devel/gal20
 .endif	# GAL20_BUILDLINK3_MK
 
Index: ./devel/gconfmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gconfmm/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/gconfmm/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.5
+++ ./devel/gconfmm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gconfmm
 
 .if !empty(GCONFMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gconfmm+=	gconfmm>=2.10.0
-BUILDLINK_RECOMMENDED.gconfmm?=	gconfmm>=2.12.0nb2
+BUILDLINK_API_DEPENDS.gconfmm+=	gconfmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gconfmm?=	gconfmm>=2.12.0nb2
 BUILDLINK_PKGSRCDIR.gconfmm?=	../../devel/gconfmm
 .endif	# GCONFMM_BUILDLINK3_MK
 
Index: ./devel/gdbada/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gdbada/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/gdbada/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.3
+++ ./devel/gdbada/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -9,8 +9,8 @@
 
 .if !empty(GDBADA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gdbada
-BUILDLINK_DEPENDS.gdbada+=	gdbada>=5.3
-BUILDLINK_RECOMMENDED.gdbada+=	gdbada>=6.3nb1
+BUILDLINK_API_DEPENDS.gdbada+=	gdbada>=5.3
+BUILDLINK_ABI_DEPENDS.gdbada+=	gdbada>=6.3nb1
 BUILDLINK_PKGSRCDIR.gdbada?=	../../devel/gdbada
 
 .include "../../mk/pthread.buildlink3.mk"
Index: ./devel/gettext/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- ./devel/gettext/Makefile	20 Feb 2006 14:04:45 -0000	1.71
+++ ./devel/gettext/Makefile	4 Apr 2006 06:26:51 -0000
@@ -10,7 +10,7 @@
 
 DEPENDS+=			gettext-m4-0.14.5:../../devel/gettext-m4
 DEPENDS+=			gettext-tools-0.14.5:../../devel/gettext-tools
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
Index: ./devel/gettext-asprintf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-asprintf/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/gettext-asprintf/buildlink3.mk	4 Feb 2006 18:03:57 -0000	1.1
+++ ./devel/gettext-asprintf/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	gettext-asprintf
 
 .if !empty(GETTEXT_ASPRINTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext-asprintf+=	gettext-asprintf>=0.14.5
+BUILDLINK_API_DEPENDS.gettext-asprintf+=	gettext-asprintf>=0.14.5
 BUILDLINK_PKGSRCDIR.gettext-asprintf?=	../../devel/gettext-asprintf
 .endif	# GETTEXT_ASPRINTF_BUILDLINK3_MK
 
Index: ./devel/gettext-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-lib/buildlink3.mk,v
retrieving revision 1.24
diff -u -r1.24 buildlink3.mk
--- ./devel/gettext-lib/buildlink3.mk	5 Feb 2006 22:45:54 -0000	1.24
+++ ./devel/gettext-lib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	gettext
 
 .if !empty(GETTEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 .endif	# GETTEXT_BUILDLINK3_MK
 
Index: ./devel/gettext-lib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-lib/builtin.mk,v
retrieving revision 1.28
diff -u -r1.28 builtin.mk
--- ./devel/gettext-lib/builtin.mk	28 Feb 2006 23:43:38 -0000	1.28
+++ ./devel/gettext-lib/builtin.mk	4 Apr 2006 06:26:51 -0000
@@ -48,7 +48,7 @@
 .    if defined(BUILTIN_PKG.gettext) && \
         !empty(IS_BUILTIN.gettext:M[yY][eE][sS])
 USE_BUILTIN.gettext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
 .        if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
 USE_BUILTIN.gettext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \
@@ -142,7 +142,7 @@
 _BLTN_GETTEXT_ICONV_DEPENDS=	gettext-lib>=0.11.5nb1
 .    if !defined(_BLTN_GETTEXT_NEEDS_ICONV)
 _BLTN_GETTEXT_NEEDS_ICONV?=	no
-.      for _dep_ in ${BUILDLINK_DEPENDS.gettext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
 .        if !empty(_BLTN_GETTEXT_NEEDS_ICONV:M[nN][oO])
 _BLTN_GETTEXT_NEEDS_ICONV!=						\
 	pkg=`${PKG_BEST_EXISTS} ${_dep_:Q}`;				\
@@ -164,7 +164,7 @@
 .        sinclude "../../converters/libiconv/${_mkfile_}"
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
 .      endfor
-BUILDLINK_DEPENDS.gettext+=	${_BLTN_GETTEXT_ICONV_DEPENDS}
+BUILDLINK_API_DEPENDS.gettext+=	${_BLTN_GETTEXT_ICONV_DEPENDS}
 _BLTN_LIBINTL+=			${BUILDLINK_LDADD.iconv}
 .    endif
 .  endif
Index: ./devel/giblib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/giblib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/giblib/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.5
+++ ./devel/giblib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	giblib
 
 .if !empty(GIBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.giblib+=	giblib>=1.2.3nb3
-BUILDLINK_RECOMMENDED.giblib+=	giblib>=1.2.4nb3
+BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.3nb3
+BUILDLINK_ABI_DEPENDS.giblib+=	giblib>=1.2.4nb3
 BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
 .endif	# GIBLIB_BUILDLINK3_MK
 
Index: ./devel/gettext-tools/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gettext-tools/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./devel/gettext-tools/Makefile	30 Mar 2006 03:44:42 -0000	1.4
+++ ./devel/gettext-tools/Makefile	4 Apr 2006 06:26:51 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=		http://www.gnu.org/software/gettext/gettext.html
 COMMENT=		Tools for providing messages in different languages
 
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 CONFLICTS=		gettext<0.14.5
 
 USE_PKGLOCALEDIR=	yes
Index: ./devel/glib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/glib/buildlink3.mk	3 Oct 2004 00:13:27 -0000	1.7
+++ ./devel/glib/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	glib
 
 .if !empty(GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib+=	glib>=1.2.10nb5
-BUILDLINK_RECOMMENDED.glib+=	glib>=1.2.10nb7
+BUILDLINK_API_DEPENDS.glib+=	glib>=1.2.10nb5
+BUILDLINK_ABI_DEPENDS.glib+=	glib>=1.2.10nb7
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 .endif	# GLIB_BUILDLINK3_MK
 
Index: ./devel/glib2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./devel/glib2/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.9
+++ ./devel/glib2/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	glib2
 
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0
-BUILDLINK_RECOMMENDED.glib2+=	glib2>=2.8.6nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0
+BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.8.6nb1
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 .endif	# GLIB2_BUILDLINK3_MK
 
Index: ./devel/glibmm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glibmm/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./devel/glibmm/Makefile	12 Mar 2006 21:09:45 -0000	1.8
+++ ./devel/glibmm/Makefile	4 Apr 2006 06:26:51 -0000
@@ -16,7 +16,7 @@
 PKGCONFIG_OVERRIDE+=	${WRKSRC:Q}/glib/glibmm-2.4.pc.in
 GNU_CONFIGURE=		yes
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsigc++2/buildlink3.mk"
Index: ./devel/glibmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glibmm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/glibmm/buildlink3.mk	5 Feb 2006 23:08:42 -0000	1.3
+++ ./devel/glibmm/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	glibmm
 
 .if !empty(GLIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibmm+=	glibmm>=2.6.1
-BUILDLINK_RECOMMENDED.glibmm?=	glibmm>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.6.1
+BUILDLINK_ABI_DEPENDS.glibmm?=	glibmm>=2.8.3nb1
 BUILDLINK_PKGSRCDIR.glibmm?=	../../devel/glibmm
 .endif	# GLIBMM_BUILDLINK3_MK
 
Index: ./devel/gmp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gmp/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/gmp/buildlink3.mk	3 Oct 2004 00:13:28 -0000	1.4
+++ ./devel/gmp/buildlink3.mk	4 Apr 2006 06:26:51 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gmp
 
 .if !empty(GMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmp+=		gmp>=4.1.2
-BUILDLINK_RECOMMENDED.gmp+=	gmp>=4.1.3nb1
+BUILDLINK_API_DEPENDS.gmp+=		gmp>=4.1.2
+BUILDLINK_ABI_DEPENDS.gmp+=	gmp>=4.1.3nb1
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
 .endif	# GMP_BUILDLINK3_MK
 
Index: ./devel/gnustep-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gnustep-base/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/gnustep-base/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.8
+++ ./devel/gnustep-base/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-base
 
 .if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-base+=	gnustep-base>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-base+=	gnustep-base>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-base+=	gnustep-base>=1.11.2nb1
 BUILDLINK_PKGSRCDIR.gnustep-base?=	../../devel/gnustep-base
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Headers\/Foundation$$/ { print "@comment in devel/gnustep-base: " $$0; next; }
Index: ./devel/gnustep-make/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gnustep-make/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/gnustep-make/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.7
+++ ./devel/gnustep-make/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-make
 
 .if !empty(GNUSTEP_MAKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-make+=	gnustep-make>=1.9.1
-BUILDLINK_RECOMMENDED.gnustep-make?=	gnustep-make>=1.11.2nb1
+BUILDLINK_API_DEPENDS.gnustep-make+=	gnustep-make>=1.9.1
+BUILDLINK_ABI_DEPENDS.gnustep-make?=	gnustep-make>=1.11.2nb1
 BUILDLINK_PKGSRCDIR.gnustep-make?=	../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"
Index: ./devel/gnustep-objc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gnustep-objc/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/gnustep-objc/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.2
+++ ./devel/gnustep-objc/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-objc
 
 .if !empty(GNUSTEP_OBJC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc+=	gnustep-objc>=1.3.0
-BUILDLINK_RECOMMENDED.gnustep-objc?=	gnustep-objc>=1.3.0nb1
+BUILDLINK_API_DEPENDS.gnustep-objc+=	gnustep-objc>=1.3.0
+BUILDLINK_ABI_DEPENDS.gnustep-objc?=	gnustep-objc>=1.3.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc?=	../../devel/gnustep-objc
 .endif	# GNUSTEP_OBJC_BUILDLINK3_MK
 
Index: ./devel/gnustep-objc-lf2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gnustep-objc-lf2/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/gnustep-objc-lf2/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.2
+++ ./devel/gnustep-objc-lf2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-objc-lf2
 
 .if !empty(GNUSTEP_OBJC_LF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-objc-lf2+=	gnustep-objc-lf2>=2.95.3.88
-BUILDLINK_RECOMMENDED.gnustep-objc-lf2?=	gnustep-objc-lf2>=2.95.3.88nb1
+BUILDLINK_API_DEPENDS.gnustep-objc-lf2+=	gnustep-objc-lf2>=2.95.3.88
+BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?=	gnustep-objc-lf2>=2.95.3.88nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?=	../../devel/gnustep-objc-lf2
 BUILDLINK_TRANSFORM.gnustep-objc-lf2?=	-e "s|Headers/objc_lf2/|Headers/objc/|g"
 BUILDLINK_TRANSFORM+=	l:objc:objc_lf2
Index: ./devel/gob2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gob2/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/gob2/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.3
+++ ./devel/gob2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gob2
 
 .if !empty(GOB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gob2+=	gob2>=2.0.10
-BUILDLINK_RECOMMENDED.gob2?=	gob2>=2.0.12nb1
+BUILDLINK_API_DEPENDS.gob2+=	gob2>=2.0.10
+BUILDLINK_ABI_DEPENDS.gob2?=	gob2>=2.0.12nb1
 BUILDLINK_PKGSRCDIR.gob2?=	../../devel/gob2
 .endif	# GOB2_BUILDLINK3_MK
 
Index: ./devel/gperf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gperf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/gperf/buildlink3.mk	5 Mar 2004 19:25:10 -0000	1.2
+++ ./devel/gperf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	gperf
 
 .if !empty(GPERF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gperf+=	gperf>=3.0.1
+BUILDLINK_API_DEPENDS.gperf+=	gperf>=3.0.1
 BUILDLINK_PKGSRCDIR.gperf?=	../../devel/gperf
 BUILDLINK_DEPMETHOD.gperf?=	build
 .endif	# GPERF_BUILDLINK3_MK
Index: ./devel/gtl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/gtl/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/gtl/buildlink3.mk	2 Nov 2004 20:36:50 -0000	1.3
+++ ./devel/gtl/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	gtl
 
 .if !empty(GTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtl+=		gtl>=1.2.0
+BUILDLINK_API_DEPENDS.gtl+=		gtl>=1.2.0
 BUILDLINK_PKGSRCDIR.gtl?=	../../devel/gtl
 .endif	# GTL_BUILDLINK3_MK
 
Index: ./devel/guile-gtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile-gtk/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/guile-gtk/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.4
+++ ./devel/guile-gtk/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	guile-gtk
 
 .if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.40
-BUILDLINK_RECOMMENDED.guile-gtk?=	guile-gtk>=0.40.91nb1
+BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.40
+BUILDLINK_ABI_DEPENDS.guile-gtk?=	guile-gtk>=0.40.91nb1
 BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile-gtk
 .endif	# GUILE_GTK_BUILDLINK3_MK
 
Index: ./devel/guile14-gtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/guile14-gtk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/guile14-gtk/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.2
+++ ./devel/guile14-gtk/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	guile-gtk
 
 .if !empty(GUILE_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
-BUILDLINK_RECOMMENDED.guile-gtk+=	guile-gtk>=0.19nb7
+BUILDLINK_API_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb4
+BUILDLINK_ABI_DEPENDS.guile-gtk+=	guile-gtk>=0.19nb7
 BUILDLINK_PKGSRCDIR.guile-gtk?=	../../devel/guile14-gtk
 .endif	# GUILE_GTK_BUILDLINK3_MK
 
Index: ./devel/hdf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/hdf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/hdf/buildlink3.mk	5 Feb 2006 23:08:43 -0000	1.2
+++ ./devel/hdf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	hdf
 
 .if !empty(HDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf+=	hdf>=4.1r5
-BUILDLINK_RECOMMENDED.hdf?=	hdf>=4.2r1nb1
+BUILDLINK_API_DEPENDS.hdf+=	hdf>=4.1r5
+BUILDLINK_ABI_DEPENDS.hdf?=	hdf>=4.2r1nb1
 BUILDLINK_PKGSRCDIR.hdf?=	../../devel/hdf
 .endif	# HDF_BUILDLINK3_MK
 
Index: ./devel/hdf5/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/hdf5/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/hdf5/buildlink3.mk	10 Feb 2006 19:56:13 -0000	1.6
+++ ./devel/hdf5/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	hdf5
 
 .if !empty(HDF5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hdf5+=	hdf5>=1.6.2
-BUILDLINK_RECOMMENDED.hdf5+=	hdf5>=1.6.5nb1
+BUILDLINK_API_DEPENDS.hdf5+=	hdf5>=1.6.2
+BUILDLINK_ABI_DEPENDS.hdf5+=	hdf5>=1.6.5nb1
 BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
 .endif	# HDF5_BUILDLINK3_MK
 
Index: ./devel/kdesdk3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/kdesdk3/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/kdesdk3/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.7
+++ ./devel/kdesdk3/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdesdk
 
 .if !empty(KDESDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdesdk?=	kdesdk>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 .endif	# KDESDK_BUILDLINK3_MK
 
Index: ./devel/ldapsdk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ldapsdk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/ldapsdk/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.2
+++ ./devel/ldapsdk/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ldapsdk
 
 .if !empty(LDAPSDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ldapsdk+=	ldapsdk>=12311998
-BUILDLINK_RECOMMENDED.ldapsdk?=	ldapsdk>=12311998nb2
+BUILDLINK_API_DEPENDS.ldapsdk+=	ldapsdk>=12311998
+BUILDLINK_ABI_DEPENDS.ldapsdk?=	ldapsdk>=12311998nb2
 BUILDLINK_PKGSRCDIR.ldapsdk?=	../../devel/ldapsdk
 .endif	# LDAPSDK_BUILDLINK3_MK
 
Index: ./devel/libFoundation/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libFoundation/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libFoundation/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.4
+++ ./devel/libFoundation/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libFoundation
 
 .if !empty(LIBFOUNDATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libFoundation+=	libFoundation>=1.0.72.107nb1
-BUILDLINK_RECOMMENDED.libFoundation?=	libFoundation>=1.0.72.107nb2
+BUILDLINK_API_DEPENDS.libFoundation+=	libFoundation>=1.0.72.107nb1
+BUILDLINK_ABI_DEPENDS.libFoundation?=	libFoundation>=1.0.72.107nb2
 BUILDLINK_PKGSRCDIR.libFoundation?=	../../devel/libFoundation
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Libraries$$/ { print "@comment in devel/libFoundation: " $$0; next; }
Index: ./devel/libargparse/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libargparse/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libargparse/buildlink3.mk	3 Oct 2004 00:13:29 -0000	1.2
+++ ./devel/libargparse/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libargparse
 
 .if !empty(LIBARGPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libargparse+=	libargparse>=0.1.0000
-BUILDLINK_RECOMMENDED.libargparse+=	libargparse>=0.1.0000nb1
+BUILDLINK_API_DEPENDS.libargparse+=	libargparse>=0.1.0000
+BUILDLINK_ABI_DEPENDS.libargparse+=	libargparse>=0.1.0000nb1
 BUILDLINK_PKGSRCDIR.libargparse?=	../../devel/libargparse
 .endif	# LIBARGPARSE_BUILDLINK3_MK
 
Index: ./devel/libast/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libast/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/libast/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.5
+++ ./devel/libast/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libast
 
 .if !empty(LIBAST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libast+=	libast>=0.5nb5
-BUILDLINK_RECOMMENDED.libast+=	libast>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libast+=	libast>=0.5nb5
+BUILDLINK_ABI_DEPENDS.libast+=	libast>=0.6.1nb1
 BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
 .endif	# LIBAST_BUILDLINK3_MK
 
Index: ./devel/libaura/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libaura/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libaura/buildlink3.mk	9 Feb 2005 05:40:28 -0000	1.1.1.1
+++ ./devel/libaura/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libaura
 
 .if !empty(LIBAURA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libaura+=	libaura>=2.0
+BUILDLINK_API_DEPENDS.libaura+=	libaura>=2.0
 BUILDLINK_PKGSRCDIR.libaura?=	../../devel/libaura
 .endif	# LIBAURA_BUILDLINK3_MK
 
Index: ./devel/libbegemot/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libbegemot/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libbegemot/buildlink3.mk	5 Apr 2005 11:13:12 -0000	1.1
+++ ./devel/libbegemot/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libbegemot
 
 .if !empty(LIBBEGEMOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbegemot+=	libbegemot>=1.9nb1
+BUILDLINK_API_DEPENDS.libbegemot+=	libbegemot>=1.9nb1
 BUILDLINK_PKGSRCDIR.libbegemot?=	../../devel/libbegemot
 .endif	# LIBBEGEMOT_BUILDLINK3_MK
 
Index: ./devel/libbonobo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libbonobo/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./devel/libbonobo/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.12
+++ ./devel/libbonobo/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libbonobo
 
 .if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.8.0
-BUILDLINK_RECOMMENDED.libbonobo+=	libbonobo>=2.10.1nb2
+BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonobo+=	libbonobo>=2.10.1nb2
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-2.0/*
Index: ./devel/libbonoboui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libbonoboui/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- ./devel/libbonoboui/Makefile	6 Mar 2006 00:18:11 -0000	1.48
+++ ./devel/libbonoboui/Makefile	4 Apr 2006 06:26:52 -0000
@@ -23,7 +23,7 @@
 
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.10.1
+BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.10.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
Index: ./devel/libbonoboui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libbonoboui/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./devel/libbonoboui/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.10
+++ ./devel/libbonoboui/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libbonoboui
 
 .if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
-BUILDLINK_RECOMMENDED.libbonoboui+=	libbonoboui>=2.10.1nb3
+BUILDLINK_API_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libbonoboui+=	libbonoboui>=2.10.1nb3
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .endif	# LIBBONOBOUI_BUILDLINK3_MK
 
Index: ./devel/libcfg+/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libcfg+/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libcfg+/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.2
+++ ./devel/libcfg+/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcfg
 
 .if !empty(LIBCFG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
-BUILDLINK_RECOMMENDED.libcfg++=	libcfg+>=0.6.2nb3
+BUILDLINK_API_DEPENDS.libcfg+=	libcfg+>=0.6.2nb1
+BUILDLINK_ABI_DEPENDS.libcfg++=	libcfg+>=0.6.2nb3
 BUILDLINK_PKGSRCDIR.libcfg?=	../../devel/libcfg+
 .endif	# LIBCFG_BUILDLINK3_MK
 
Index: ./devel/libdfui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libdfui/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libdfui/buildlink3.mk	9 Feb 2005 05:41:36 -0000	1.1.1.1
+++ ./devel/libdfui/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libdfui
 
 .if !empty(LIBDFUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdfui+=	libdfui>=3.0
+BUILDLINK_API_DEPENDS.libdfui+=	libdfui>=3.0
 BUILDLINK_PKGSRCDIR.libdfui?=	../../devel/libdfui
 .endif	# LIBDFUI_BUILDLINK3_MK
 
Index: ./devel/libdnsres/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libdnsres/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ./devel/libdnsres/Makefile	26 Feb 2006 17:05:08 -0000	1.3
+++ ./devel/libdnsres/Makefile	4 Apr 2006 06:26:52 -0000
@@ -15,7 +15,7 @@
 GNU_CONFIGURE=		YES
 
 # uses event_once
-BUILDLINK_DEPENDS.libevent+=	libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=0.9
 
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./devel/libdnsres/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libdnsres/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libdnsres/buildlink3.mk	19 Feb 2006 17:11:06 -0000	1.1.1.1
+++ ./devel/libdnsres/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libdnsres
 
 .if !empty(LIBDNSRES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnsres+=	libdnsres>=0.1a
+BUILDLINK_API_DEPENDS.libdnsres+=	libdnsres>=0.1a
 BUILDLINK_PKGSRCDIR.libdnsres?=	../../devel/libdnsres
 .endif	# LIBDNSRES_BUILDLINK3_MK
 
Index: ./devel/libdockapp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libdockapp/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libdockapp/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.4
+++ ./devel/libdockapp/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdockapp
 
 .if !empty(LIBDOCKAPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdockapp+=		libdockapp>=0.4.0
-BUILDLINK_RECOMMENDED.libdockapp+=	libdockapp>=0.4.0nb2
+BUILDLINK_API_DEPENDS.libdockapp+=		libdockapp>=0.4.0
+BUILDLINK_ABI_DEPENDS.libdockapp+=	libdockapp>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.libdockapp?=	../../devel/libdockapp
 .endif	# LIBDOCKAPP_BUILDLINK3_MK
 
Index: ./devel/libebml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libebml/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./devel/libebml/buildlink3.mk	5 Feb 2006 23:08:44 -0000	1.9
+++ ./devel/libebml/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -16,8 +16,8 @@
 BUILDLINK_PACKAGES+=	libebml
 
 .if !empty(LIBEBML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libebml+=	libebml>=0.7.6
-BUILDLINK_RECOMMENDED.libebml?=	libebml>=0.7.6nb1
+BUILDLINK_API_DEPENDS.libebml+=	libebml>=0.7.6
+BUILDLINK_ABI_DEPENDS.libebml?=	libebml>=0.7.6nb1
 BUILDLINK_PKGSRCDIR.libebml?=	../../devel/libebml
 .endif	# LIBEBML_BUILDLINK3_MK
 
Index: ./devel/libelf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libelf/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libelf/buildlink3.mk	13 Aug 2004 07:09:01 -0000	1.1
+++ ./devel/libelf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libelf
 
 .if !empty(LIBELF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libelf+=	libelf>=0.8.5
+BUILDLINK_API_DEPENDS.libelf+=	libelf>=0.8.5
 BUILDLINK_PKGSRCDIR.libelf?=	../../devel/libelf
 BUILDLINK_DEPMETHOD.libelf?=	build
 .endif	# LIBELF_BUILDLINK3_MK
Index: ./devel/libetm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libetm/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libetm/buildlink3.mk	5 Apr 2005 11:10:27 -0000	1.1
+++ ./devel/libetm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libetm
 
 .if !empty(LIBETM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetm+=	libetm>=1.09
+BUILDLINK_API_DEPENDS.libetm+=	libetm>=1.09
 BUILDLINK_PKGSRCDIR.libetm?=	../../devel/libetm
 BUILDLINK_DEPMETHOD.libetm?=	build
 .endif	# LIBETM_BUILDLINK3_MK
Index: ./devel/libevent/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libevent/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libevent/buildlink3.mk	16 Sep 2005 14:46:43 -0000	1.3
+++ ./devel/libevent/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libevent
 
 .if !empty(LIBEVENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libevent+=	libevent>=0.6
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=0.6
 BUILDLINK_PKGSRCDIR.libevent?=	../../devel/libevent
 .endif	# LIBEVENT_BUILDLINK3_MK
 
Index: ./devel/libevent/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libevent/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./devel/libevent/builtin.mk	1 Jun 2005 18:02:44 -0000	1.3
+++ ./devel/libevent/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.libevent) && \
         !empty(IS_BUILTIN.libevent:M[yY][eE][sS])
 USE_BUILTIN.libevent=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libevent}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libevent}
 .        if !empty(USE_BUILTIN.libevent:M[yY][eE][sS])
 USE_BUILTIN.libevent!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \
Index: ./devel/libextractor/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libextractor/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/libextractor/buildlink3.mk	5 Mar 2006 22:06:38 -0000	1.5
+++ ./devel/libextractor/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libextractor
 
 .if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libextractor+=	libextractor>=0.3.10
-BUILDLINK_RECOMMENDED.libextractor+=	libextractor>=0.5.3nb3
+BUILDLINK_API_DEPENDS.libextractor+=	libextractor>=0.3.10
+BUILDLINK_ABI_DEPENDS.libextractor+=	libextractor>=0.5.3nb3
 BUILDLINK_PKGSRCDIR.libextractor?=	../../devel/libextractor
 .endif	# LIBEXTRACTOR_BUILDLINK3_MK
 
Index: ./devel/libffi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libffi/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libffi/buildlink3.mk	3 Oct 2004 00:13:29 -0000	1.2
+++ ./devel/libffi/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libffi
 
 .if !empty(LIBFFI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libffi+=	libffi>=1.20
-BUILDLINK_RECOMMENDED.libffi+=	libffi>=2.0betanb1
+BUILDLINK_API_DEPENDS.libffi+=	libffi>=1.20
+BUILDLINK_ABI_DEPENDS.libffi+=	libffi>=2.0betanb1
 BUILDLINK_PKGSRCDIR.libffi?=	../../devel/libffi
 .endif	# LIBFFI_BUILDLINK3_MK
 
Index: ./devel/libgail-gnome/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgail-gnome/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/libgail-gnome/buildlink3.mk	6 Mar 2006 00:18:12 -0000	1.8
+++ ./devel/libgail-gnome/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgail-gnome
 
 .if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
-BUILDLINK_RECOMMENDED.libgail-gnome?=	libgail-gnome>=1.1.3
+BUILDLINK_API_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
+BUILDLINK_ABI_DEPENDS.libgail-gnome?=	libgail-gnome>=1.1.3
 BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
 .endif	# LIBGAIL_GNOME_BUILDLINK3_MK
 
Index: ./devel/libgetopt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgetopt/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/libgetopt/buildlink3.mk	17 May 2004 21:32:34 -0000	1.8
+++ ./devel/libgetopt/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	getopt
 
 .if !empty(LIBGETOPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.getopt+=	libgetopt>=1.3
+BUILDLINK_API_DEPENDS.getopt+=	libgetopt>=1.3
 BUILDLINK_PKGSRCDIR.getopt?=	../../devel/libgetopt
 .endif	# LIBGETOPT_BUILDLINK3_MK
 
Index: ./devel/libgetopt/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgetopt/builtin.mk,v
retrieving revision 1.4
diff -u -r1.4 builtin.mk
--- ./devel/libgetopt/builtin.mk	5 Jun 2005 09:25:37 -0000	1.4
+++ ./devel/libgetopt/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -32,7 +32,7 @@
 .    if defined(BUILTIN_PKG.getopt) && \
         !empty(IS_BUILTIN.getopt:M[yY][eE][sS])
 USE_BUILTIN.getopt=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.getopt}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.getopt}
 .        if !empty(USE_BUILTIN.getopt:M[yY][eE][sS])
 USE_BUILTIN.getopt!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.getopt:Q}; then	\
Index: ./devel/libglade/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libglade/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/libglade/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.5
+++ ./devel/libglade/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libglade
 
 .if !empty(LIBGLADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade+=	libglade>=0.17nb5
-BUILDLINK_RECOMMENDED.libglade+=	libglade>=0.17nb8
+BUILDLINK_API_DEPENDS.libglade+=	libglade>=0.17nb5
+BUILDLINK_ABI_DEPENDS.libglade+=	libglade>=0.17nb8
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
 .endif	# LIBGLADE_BUILDLINK3_MK
 
Index: ./devel/libglade2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libglade2/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- ./devel/libglade2/Makefile	21 Mar 2006 06:00:44 -0000	1.43
+++ ./devel/libglade2/Makefile	4 Apr 2006 06:26:52 -0000
@@ -25,9 +25,9 @@
 XML_ENTRIES=	system http://glade.gnome.org/glade-2.0.dtd \
 		${PREFIX}/share/xml/libglade/glade-2.0.dtd
 
-BUILDLINK_DEPENDS.atk+=		atk>=1.9.0
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.atk+=		atk>=1.9.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/libglade/2.0
Index: ./devel/libglade2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libglade2/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./devel/libglade2/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.10
+++ ./devel/libglade2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libglade2
 
 .if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.3.6
-BUILDLINK_RECOMMENDED.libglade2+=	libglade2>=2.5.1nb2
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.3.6
+BUILDLINK_ABI_DEPENDS.libglade2+=	libglade2>=2.5.1nb2
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/libglade$$/ { next; }
Index: ./devel/libglademm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libglademm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libglademm/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.3
+++ ./devel/libglademm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libglademm
 
 .if !empty(LIBGLADEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglademm+=	libglademm>=2.6.0
-BUILDLINK_RECOMMENDED.libglademm?=	libglademm>=2.6.1nb2
+BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
+BUILDLINK_ABI_DEPENDS.libglademm?=	libglademm>=2.6.1nb2
 BUILDLINK_PKGSRCDIR.libglademm?=	../../devel/libglademm
 .endif	# LIBGLADEMM_BUILDLINK3_MK
 
Index: ./devel/libgnome/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnome/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- ./devel/libgnome/Makefile	21 Mar 2006 06:00:44 -0000	1.50
+++ ./devel/libgnome/Makefile	4 Apr 2006 06:26:52 -0000
@@ -14,7 +14,7 @@
 DEPENDS+=	docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.esound+=	esound>=0.2.26
+BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.26
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake pkg-config
Index: ./devel/libgnome/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnome/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./devel/libgnome/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.10
+++ ./devel/libgnome/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnome
 
 .if !empty(LIBGNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.8.0
-BUILDLINK_RECOMMENDED.libgnome+=	libgnome>=2.12.0.1nb3
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnome+=	libgnome>=2.12.0.1nb3
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .endif	# LIBGNOME_BUILDLINK3_MK
 
Index: ./devel/libgnomemm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnomemm/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/libgnomemm/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.5
+++ ./devel/libgnomemm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomemm
 
 .if !empty(LIBGNOMEMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomemm+=	libgnomemm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomemm?=	libgnomemm>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomemm+=	libgnomemm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomemm?=	libgnomemm>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.libgnomemm?=	../../devel/libgnomemm
 .endif	# LIBGNOMEMM_BUILDLINK3_MK
 
Index: ./devel/libgnomeui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnomeui/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- ./devel/libgnomeui/Makefile	6 Mar 2006 00:18:12 -0000	1.54
+++ ./devel/libgnomeui/Makefile	4 Apr 2006 06:26:52 -0000
@@ -27,8 +27,8 @@
 PKGCONFIG_BASE=		${WRKSRC}/libgnomeui/libgnomeui-2.0.pc
 PKGCONFIG_OVERRIDE=	${PKGCONFIG_BASE}.in
 
-BUILDLINK_DEPENDS.gtk2=		gtk2+>=2.8.0
-BUILDLINK_DEPENDS.libgnome=	libgnome>=2.12.0.1
+BUILDLINK_API_DEPENDS.gtk2=		gtk2+>=2.8.0
+BUILDLINK_API_DEPENDS.libgnome=	libgnome>=2.12.0.1
 
 # Needed because part of the pc files doesn't get filled in till after
 # configure does its pass
Index: ./devel/libgnomeui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnomeui/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./devel/libgnomeui/buildlink3.mk	6 Mar 2006 00:18:12 -0000	1.11
+++ ./devel/libgnomeui/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomeui
 
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeui+=	libgnomeui>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeui+=	libgnomeui>=2.12.1
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .endif	# LIBGNOMEUI_BUILDLINK3_MK
 
Index: ./devel/libgnomeuimm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgnomeuimm/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libgnomeuimm/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.4
+++ ./devel/libgnomeuimm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomeuimm
 
 .if !empty(LIBGNOMEUIMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.10.0
-BUILDLINK_RECOMMENDED.libgnomeuimm?=	libgnomeuimm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.10.0
+BUILDLINK_ABI_DEPENDS.libgnomeuimm?=	libgnomeuimm>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.libgnomeuimm?=	../../devel/libgnomeuimm
 .endif	# LIBGNOMEUIMM_BUILDLINK3_MK
 
Index: ./devel/libgphoto2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgphoto2/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/libgphoto2/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.6
+++ ./devel/libgphoto2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgphoto2
 
 .if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
-BUILDLINK_RECOMMENDED.libgphoto2+=	libgphoto2>=2.1.6nb1
+BUILDLINK_API_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
+BUILDLINK_ABI_DEPENDS.libgphoto2+=	libgphoto2>=2.1.6nb1
 BUILDLINK_PKGSRCDIR.libgphoto2?=	../../devel/libgphoto2
 .endif	# LIBGPHOTO2_BUILDLINK3_MK
 
Index: ./devel/libgsf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libgsf/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./devel/libgsf/buildlink3.mk	6 Mar 2006 00:18:11 -0000	1.11
+++ ./devel/libgsf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgsf
 
 .if !empty(LIBGSF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.13.3
-BUILDLINK_RECOMMENDED.libgsf?=	libgsf>=1.14.0
+BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.13.3
+BUILDLINK_ABI_DEPENDS.libgsf?=	libgsf>=1.14.0
 BUILDLINK_PKGSRCDIR.libgsf?=	../../devel/libgsf
 .endif	# LIBGSF_BUILDLINK3_MK
 
Index: ./devel/libhfs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libhfs/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libhfs/buildlink3.mk	3 Jan 2005 01:56:15 -0000	1.1
+++ ./devel/libhfs/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libhfs
 
 .if !empty(LIBHFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libhfs+=	libhfs>=3.2.6nb1
+BUILDLINK_API_DEPENDS.libhfs+=	libhfs>=3.2.6nb1
 BUILDLINK_PKGSRCDIR.libhfs?=	../../devel/libhfs
 .endif	# LIBHFS_BUILDLINK3_MK
 
Index: ./devel/libiberty/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libiberty/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libiberty/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.3
+++ ./devel/libiberty/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libiberty
 
 .if !empty(LIBIBERTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libiberty+=	libiberty>=1.0nb1
-BUILDLINK_RECOMMENDED.libiberty?=	libiberty>=1.0nb2
+BUILDLINK_API_DEPENDS.libiberty+=	libiberty>=1.0nb1
+BUILDLINK_ABI_DEPENDS.libiberty?=	libiberty>=1.0nb2
 BUILDLINK_PKGSRCDIR.libiberty?=	../../devel/libiberty
 .endif	# LIBIBERTY_BUILDLINK3_MK
 BUILDLINK_DEPMETHOD.libiberty?= build
Index: ./devel/libidn/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libidn/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/libidn/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.8
+++ ./devel/libidn/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libidn
 
 .if !empty(LIBIDN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidn+=	libidn>=0.4.6
-BUILDLINK_RECOMMENDED.libidn+=	libidn>=0.6.1nb1
+BUILDLINK_API_DEPENDS.libidn+=	libidn>=0.4.6
+BUILDLINK_ABI_DEPENDS.libidn+=	libidn>=0.6.1nb1
 BUILDLINK_PKGSRCDIR.libidn?=	../../devel/libidn
 .endif	# LIBIDN_BUILDLINK3_MK
 
Index: ./devel/libinstaller/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libinstaller/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libinstaller/buildlink3.mk	9 Feb 2005 05:44:18 -0000	1.1.1.1
+++ ./devel/libinstaller/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libinstaller
 
 .if !empty(LIBINSTALLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libinstaller+=	libinstaller>=4.0
+BUILDLINK_API_DEPENDS.libinstaller+=	libinstaller>=4.0
 BUILDLINK_PKGSRCDIR.libinstaller?=	../../devel/libinstaller
 .endif	# LIBINSTALLER_BUILDLINK3_MK
 
Index: ./devel/libjit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libjit/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libjit/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.3
+++ ./devel/libjit/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libjit
 
 .if !empty(LIBJIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libjit+=	libjit>=0.0.2
-BUILDLINK_RECOMMENDED.libjit+=	libjit>=0.0.4nb1
+BUILDLINK_API_DEPENDS.libjit+=	libjit>=0.0.2
+BUILDLINK_ABI_DEPENDS.libjit+=	libjit>=0.0.4nb1
 BUILDLINK_PKGSRCDIR.libjit?=	../../devel/libjit
 .endif	# LIBJIT_BUILDLINK3_MK
 
Index: ./devel/libltdl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libltdl/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libltdl/buildlink3.mk	25 Nov 2004 22:55:54 -0000	1.3
+++ ./devel/libltdl/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -19,7 +19,7 @@
 BUILDLINK_PACKAGES+=	libltdl
 
 .if !empty(LIBLTDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libltdl+=	libltdl>=1.5.10
+BUILDLINK_API_DEPENDS.libltdl+=	libltdl>=1.5.10
 BUILDLINK_PKGSRCDIR.libltdl?=	../../devel/libltdl
 .endif	# LIBLTDL_BUILDLINK3_MK
 
Index: ./devel/libmatchbox/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmatchbox/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/libmatchbox/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.6
+++ ./devel/libmatchbox/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmatchbox
 
 .if !empty(LIBMATCHBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatchbox+=	libmatchbox>=1.4
-BUILDLINK_RECOMMENDED.libmatchbox+=	libmatchbox>=1.7nb2
+BUILDLINK_API_DEPENDS.libmatchbox+=	libmatchbox>=1.4
+BUILDLINK_ABI_DEPENDS.libmatchbox+=	libmatchbox>=1.7nb2
 BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
 .endif	# LIBMATCHBOX_BUILDLINK3_MK
 
Index: ./devel/libmemcache/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmemcache/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libmemcache/buildlink3.mk	11 Oct 2005 15:31:20 -0000	1.1.1.1
+++ ./devel/libmemcache/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmemcache
 
 .if !empty(LIBMEMCACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemcache+=	libmemcache>=1.4.0beta5
+BUILDLINK_API_DEPENDS.libmemcache+=	libmemcache>=1.4.0beta5
 BUILDLINK_PKGSRCDIR.libmemcache?=	../../devel/libmemcache
 .endif	# LIBMEMCACHE_BUILDLINK3_MK
 
Index: ./devel/libmemmgr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmemmgr/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libmemmgr/buildlink3.mk	9 Apr 2005 18:37:08 -0000	1.1
+++ ./devel/libmemmgr/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmemmgr
 
 .if !empty(LIBMEMMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmemmgr+=	libmemmgr>=1.04
+BUILDLINK_API_DEPENDS.libmemmgr+=	libmemmgr>=1.04
 BUILDLINK_PKGSRCDIR.libmemmgr?=	../../devel/libmemmgr
 BUILDLINK_DEPMETHOD.libmemmgr?=	build
 .endif	# LIBMEMMGR_BUILDLINK3_MK
Index: ./devel/libmimedir/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmimedir/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libmimedir/buildlink3.mk	13 Oct 2005 20:41:51 -0000	1.2
+++ ./devel/libmimedir/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmimedir
 
 .if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmimedir+=	libmimedir>=0.4nb1
+BUILDLINK_API_DEPENDS.libmimedir+=	libmimedir>=0.4nb1
 BUILDLINK_PKGSRCDIR.libmimedir?=	../../devel/libmimedir
 .endif	# LIBMIMEDIR_BUILDLINK3_MK
 
Index: ./devel/libmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmm/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/libmm/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.6
+++ ./devel/libmm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmm
 
 .if !empty(LIBMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmm+=	libmm>=1.2.1
-BUILDLINK_RECOMMENDED.libmm+=	libmm>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libmm+=	libmm>=1.2.1
+BUILDLINK_ABI_DEPENDS.libmm+=	libmm>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
 .endif	# LIBMM_BUILDLINK3_MK
 
Index: ./devel/libnet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnet/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libnet/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.2
+++ ./devel/libnet/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libnet
 
 .if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+=	libnet>=1.0.1bnb3
-BUILDLINK_RECOMMENDED.libnet+=	libnet>=1.0.1bnb4
+BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.0.1bnb3
+BUILDLINK_ABI_DEPENDS.libnet+=	libnet>=1.0.1bnb4
 BUILDLINK_PKGSRCDIR.libnet?=	../../devel/libnet
 .endif	# LIBNET_BUILDLINK3_MK
 
Index: ./devel/libnet11/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libnet11/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/libnet11/buildlink3.mk	20 Jan 2005 18:04:58 -0000	1.1.1.1
+++ ./devel/libnet11/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libnet
 
 .if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnet+=	libnet>=1.1.2.1
+BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.1.2.1
 BUILDLINK_PKGSRCDIR.libnet?=	../../devel/libnet11
 .endif	# LIBNET_BUILDLINK3_MK
 
Index: ./devel/libntlm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libntlm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libntlm/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.3
+++ ./devel/libntlm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libntlm
 
 .if !empty(LIBNTLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libntlm+=	libntlm>=0.3.2
-BUILDLINK_RECOMMENDED.libntlm+=	libntlm>=0.3.6nb1
+BUILDLINK_API_DEPENDS.libntlm+=	libntlm>=0.3.2
+BUILDLINK_ABI_DEPENDS.libntlm+=	libntlm>=0.3.6nb1
 BUILDLINK_PKGSRCDIR.libntlm?=	../../devel/libntlm
 .endif	# LIBNTLM_BUILDLINK3_MK
 
Index: ./devel/liboil/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/liboil/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/liboil/buildlink3.mk	16 Jan 2006 18:21:19 -0000	1.1
+++ ./devel/liboil/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	liboil
 
 .if !empty(LIBOIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboil+=	liboil>=0.3.6
+BUILDLINK_API_DEPENDS.liboil+=	liboil>=0.3.6
 BUILDLINK_PKGSRCDIR.liboil?=	../../devel/liboil
 .endif	# LIBOIL_BUILDLINK3_MK
 
Index: ./devel/libole2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libole2/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libole2/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.2
+++ ./devel/libole2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libole2
 
 .if !empty(LIBOLE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libole2+=	libole2>=0.2.4nb1
-BUILDLINK_RECOMMENDED.libole2+=	libole2>=0.2.4nb2
+BUILDLINK_API_DEPENDS.libole2+=	libole2>=0.2.4nb1
+BUILDLINK_ABI_DEPENDS.libole2+=	libole2>=0.2.4nb2
 BUILDLINK_PKGSRCDIR.libole2?=	../../devel/libole2
 .endif	# LIBOLE2_BUILDLINK3_MK
 
Index: ./devel/liboop/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/liboop/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/liboop/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.2
+++ ./devel/liboop/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	liboop
 
 .if !empty(LIBOOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liboop+=	liboop>=0.9
-BUILDLINK_RECOMMENDED.liboop+=	liboop>=1.0nb1
+BUILDLINK_API_DEPENDS.liboop+=	liboop>=0.9
+BUILDLINK_ABI_DEPENDS.liboop+=	liboop>=1.0nb1
 BUILDLINK_PKGSRCDIR.liboop?=	../../devel/liboop
 .endif	# LIBOOP_BUILDLINK3_MK
 
Index: ./devel/libosip/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libosip/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libosip/buildlink3.mk	1 Apr 2005 19:50:42 -0000	1.3
+++ ./devel/libosip/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libosip2
 
 .if !empty(LIBOSIP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libosip2+=	libosip2>=2.2.0
-BUILDLINK_RECOMMENDED.libosip2+=	libosip2>=2.2.0
+BUILDLINK_API_DEPENDS.libosip2+=	libosip2>=2.2.0
+BUILDLINK_ABI_DEPENDS.libosip2+=	libosip2>=2.2.0
 BUILDLINK_PKGSRCDIR.libosip2?=	../../devel/libosip
 .endif	# LIBOSIP2_BUILDLINK3_MK
 
Index: ./devel/libportlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libportlib/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libportlib/buildlink3.mk	9 Apr 2005 18:38:10 -0000	1.1
+++ ./devel/libportlib/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libportlib
 
 .if !empty(LIBPORTLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libportlib+=	libportlib>=1.01
+BUILDLINK_API_DEPENDS.libportlib+=	libportlib>=1.01
 BUILDLINK_PKGSRCDIR.libportlib?=	../../devel/libportlib
 BUILDLINK_DEPMETHOD.libportlib?=	build
 .endif	# LIBPORTLIB_BUILDLINK3_MK
Index: ./devel/libproplist/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libproplist/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libproplist/buildlink3.mk	3 Oct 2004 00:13:30 -0000	1.3
+++ ./devel/libproplist/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libproplist
 
 .if !empty(LIBPROPLIST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libproplist+=		libproplist>=0.10.1
-BUILDLINK_RECOMMENDED.libproplist+=	libproplist>=0.10.1nb1
+BUILDLINK_API_DEPENDS.libproplist+=		libproplist>=0.10.1
+BUILDLINK_ABI_DEPENDS.libproplist+=	libproplist>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.libproplist?=	../../devel/libproplist
 .endif	# LIBPROPLIST_BUILDLINK3_MK
 
Index: ./devel/librfuncs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/librfuncs/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/librfuncs/buildlink3.mk	26 Jan 2006 18:47:06 -0000	1.4
+++ ./devel/librfuncs/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	librfuncs
 
 .if !empty(LIBRFUNCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librfuncs+=	librfuncs>=1.0.4
+BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.4
 BUILDLINK_PKGSRCDIR.librfuncs?=	../../devel/librfuncs
 .endif	# LIBRFUNCS_BUILDLINK3_MK
 
Index: ./devel/librsync/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/librsync/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/librsync/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.3
+++ ./devel/librsync/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	librsync
 
 .if !empty(LIBRSYNC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6nb2
-BUILDLINK_RECOMMENDED.librsync+=	librsync>=0.9.7nb1
+BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6nb2
+BUILDLINK_ABI_DEPENDS.librsync+=	librsync>=0.9.7nb1
 BUILDLINK_PKGSRCDIR.librsync?=	../../devel/librsync
 .endif	# LIBRSYNC_BUILDLINK3_MK
 
Index: ./devel/libscsi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libscsi/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libscsi/buildlink3.mk	31 May 2004 17:13:26 -0000	1.1
+++ ./devel/libscsi/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libscsi
 
 .if !empty(LIBSCSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libscsi+=	libscsi>=1.6
+BUILDLINK_API_DEPENDS.libscsi+=	libscsi>=1.6
 BUILDLINK_PKGSRCDIR.libscsi?=	../../devel/libscsi
 BUILDLINK_DEPMETHOD.libscsi?=	build
 .endif	# LIBSCSI_BUILDLINK3_MK
Index: ./devel/libsigc++/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libsigc++/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/libsigc++/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.5
+++ ./devel/libsigc++/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+=	libsigc++>=1.2.3nb1
-BUILDLINK_RECOMMENDED.libsigcxx+=	libsigc++>=1.2.7nb1
+BUILDLINK_API_DEPENDS.libsigcxx+=	libsigc++>=1.2.3nb1
+BUILDLINK_ABI_DEPENDS.libsigcxx+=	libsigc++>=1.2.7nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++
 .endif	# LIBSIGC++_BUILDLINK3_MK
 
Index: ./devel/libsigc++2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libsigc++2/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libsigc++2/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.4
+++ ./devel/libsigc++2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsigcxx
 
 .if !empty(LIBSIGC++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigcxx+=	libsigc++2>=2.0.3
-BUILDLINK_RECOMMENDED.libsigcxx+=	libsigc++2>=2.0.17nb1
+BUILDLINK_API_DEPENDS.libsigcxx+=	libsigc++2>=2.0.3
+BUILDLINK_ABI_DEPENDS.libsigcxx+=	libsigc++2>=2.0.17nb1
 BUILDLINK_PKGSRCDIR.libsigcxx?=	../../devel/libsigc++2
 .endif	# LIBSIGC++_BUILDLINK3_MK
 
Index: ./devel/libsigsegv/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libsigsegv/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libsigsegv/buildlink3.mk	11 Mar 2006 22:03:52 -0000	1.2
+++ ./devel/libsigsegv/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libsigsegv
 
 .if !empty(LIBSIGSEGV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsigsegv+=	libsigsegv>=2.2
+BUILDLINK_API_DEPENDS.libsigsegv+=	libsigsegv>=2.2
 BUILDLINK_PKGSRCDIR.libsigsegv?=	../../devel/libsigsegv
 # only installs a static library
 BUILDLINK_DEPMETHOD.libsigsegv?=	build
Index: ./devel/libslang/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libslang/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/libslang/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.8
+++ ./devel/libslang/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	libslang
 
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libslang+=	libslang>=1.4.9nb1
-BUILDLINK_RECOMMENDED.libslang+=	libslang>=1.4.9nb4
+BUILDLINK_API_DEPENDS.libslang+=	libslang>=1.4.9nb1
+BUILDLINK_ABI_DEPENDS.libslang+=	libslang>=1.4.9nb4
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 .endif	# LIBSLANG_BUILDLINK3_MK
 
Index: ./devel/libstatgrab/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libstatgrab/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libstatgrab/buildlink3.mk	30 Oct 2004 00:30:29 -0000	1.4
+++ ./devel/libstatgrab/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libstatgrab
 
 .if !empty(LIBSTATGRAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstatgrab+=	libstatgrab>=0.10
-BUILDLINK_RECOMMENDED.libstatgrab+=	libstatgrab>=0.10.3nb1
+BUILDLINK_API_DEPENDS.libstatgrab+=	libstatgrab>=0.10
+BUILDLINK_ABI_DEPENDS.libstatgrab+=	libstatgrab>=0.10.3nb1
 BUILDLINK_PKGSRCDIR.libstatgrab?=	../../devel/libstatgrab
 .endif	# LIBSTATGRAB_BUILDLINK3_MK
 
Index: ./devel/libstroke/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libstroke/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/libstroke/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.7
+++ ./devel/libstroke/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libstroke
 
 .if !empty(LIBSTROKE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libstroke+=	libstroke>=0.5.1
-BUILDLINK_RECOMMENDED.libstroke+=	libstroke>=0.5.1nb2
+BUILDLINK_API_DEPENDS.libstroke+=	libstroke>=0.5.1
+BUILDLINK_ABI_DEPENDS.libstroke+=	libstroke>=0.5.1nb2
 BUILDLINK_PKGSRCDIR.libstroke?=	../../devel/libstroke
 .endif	# LIBSTROKE_BUILDLINK3_MK
 
Index: ./devel/libtar/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtar/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/libtar/buildlink3.mk	18 Mar 2004 09:12:10 -0000	1.3
+++ ./devel/libtar/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libtar
 
 .if !empty(LIBTAR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtar+=	libtar>=1.2.11
+BUILDLINK_API_DEPENDS.libtar+=	libtar>=1.2.11
 BUILDLINK_PKGSRCDIR.libtar?=	../../devel/libtar
 .endif	# LIBTAR_BUILDLINK3_MK
 
Index: ./devel/libtecla/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtecla/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/libtecla/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.2
+++ ./devel/libtecla/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtecla
 
 .if !empty(LIBTECLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtecla+=	libtecla>=1.5.0
-BUILDLINK_RECOMMENDED.libtecla?=	libtecla>=1.6.1nb1
+BUILDLINK_API_DEPENDS.libtecla+=	libtecla>=1.5.0
+BUILDLINK_ABI_DEPENDS.libtecla?=	libtecla>=1.6.1nb1
 BUILDLINK_PKGSRCDIR.libtecla?=	../../devel/libtecla
 .endif	# LIBTECLA_BUILDLINK3_MK
 
Index: ./devel/libts/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libts/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/libts/buildlink3.mk	31 Mar 2005 01:03:12 -0000	1.1
+++ ./devel/libts/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	libts
 
 .if !empty(LIBTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libts+=	libts>=1.08
+BUILDLINK_API_DEPENDS.libts+=	libts>=1.08
 BUILDLINK_PKGSRCDIR.libts?=	../../devel/libts
 .endif	# LIBTS_BUILDLINK3_MK
 
Index: ./devel/libusb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libusb/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/libusb/buildlink3.mk	11 Mar 2006 08:34:13 -0000	1.4
+++ ./devel/libusb/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libusb
 
 .if !empty(LIBUSB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libusb+=	libusb>=0.1.7
-BUILDLINK_RECOMMENDED.libusb+=	libusb>=0.1.8nb2
+BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.7
+BUILDLINK_ABI_DEPENDS.libusb+=	libusb>=0.1.8nb2
 BUILDLINK_PKGSRCDIR.libusb?=	../../devel/libusb
 .endif	# LIBUSB_BUILDLINK3_MK
 
Index: ./devel/libwnck/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libwnck/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./devel/libwnck/buildlink3.mk	5 Feb 2006 23:08:45 -0000	1.9
+++ ./devel/libwnck/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libwnck
 
 .if !empty(LIBWNCK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.10.0
-BUILDLINK_RECOMMENDED.libwnck?=	libwnck>=2.12.2nb2
+BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.10.0
+BUILDLINK_ABI_DEPENDS.libwnck?=	libwnck>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 .endif	# LIBWNCK_BUILDLINK3_MK
 
Index: ./devel/lwp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/lwp/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/lwp/buildlink3.mk	3 Oct 2004 00:13:31 -0000	1.2
+++ ./devel/lwp/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lwp
 
 .if !empty(LWP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lwp+=	lwp>=1.6
-BUILDLINK_RECOMMENDED.lwp+=	lwp>=1.10nb1
+BUILDLINK_API_DEPENDS.lwp+=	lwp>=1.6
+BUILDLINK_ABI_DEPENDS.lwp+=	lwp>=1.10nb1
 BUILDLINK_PKGSRCDIR.lwp?=	../../devel/lwp
 .endif	# LWP_BUILDLINK3_MK
 
Index: ./devel/nbitools/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nbitools/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/nbitools/buildlink3.mk	22 May 2005 20:07:53 -0000	1.4
+++ ./devel/nbitools/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	nbitools
 
 .if !empty(NBITOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nbitools+=	nbitools>=6.3
+BUILDLINK_API_DEPENDS.nbitools+=	nbitools>=6.3
 BUILDLINK_PKGSRCDIR.nbitools?=	../../devel/nbitools
 BUILDLINK_DEPMETHOD.nbitools?=	build
 
Index: ./devel/ncurses/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ncurses/buildlink3.mk,v
retrieving revision 1.24
diff -u -r1.24 buildlink3.mk
--- ./devel/ncurses/buildlink3.mk	3 Oct 2004 00:13:31 -0000	1.24
+++ ./devel/ncurses/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ncurses
 
 .if !empty(NCURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ncurses+=	ncurses>=5.3nb1
-BUILDLINK_RECOMMENDED.ncurses+=	ncurses>=5.4nb1
+BUILDLINK_API_DEPENDS.ncurses+=	ncurses>=5.3nb1
+BUILDLINK_ABI_DEPENDS.ncurses+=	ncurses>=5.4nb1
 BUILDLINK_PKGSRCDIR.ncurses?=	../../devel/ncurses
 .endif	# NCURSES_BUILDLINK3_MK
 
Index: ./devel/ncurses/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ncurses/builtin.mk,v
retrieving revision 1.8
diff -u -r1.8 builtin.mk
--- ./devel/ncurses/builtin.mk	1 Jun 2005 18:02:44 -0000	1.8
+++ ./devel/ncurses/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -52,7 +52,7 @@
 .    if defined(BUILTIN_PKG.ncurses) && \
         !empty(IS_BUILTIN.ncurses:M[yY][eE][sS])
 USE_BUILTIN.ncurses=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.ncurses}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.ncurses}
 .        if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 USE_BUILTIN.ncurses!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.ncurses:Q}; then \
Index: ./devel/netcdf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/netcdf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/netcdf/buildlink3.mk	3 Oct 2004 00:13:31 -0000	1.2
+++ ./devel/netcdf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	netcdf
 
 .if !empty(NETCDF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netcdf+=	netcdf>=3.5
-BUILDLINK_RECOMMENDED.netcdf+=	netcdf>=3.5.0nb2
+BUILDLINK_API_DEPENDS.netcdf+=	netcdf>=3.5
+BUILDLINK_ABI_DEPENDS.netcdf+=	netcdf>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.netcdf?=	../../devel/netcdf
 .endif	# NETCDF_BUILDLINK3_MK
 
Index: ./devel/newt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/newt/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/newt/buildlink3.mk	5 Feb 2006 23:08:49 -0000	1.2
+++ ./devel/newt/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	newt
 
 .if !empty(NEWT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.newt+=	newt>=0.51.6
-BUILDLINK_RECOMMENDED.newt?=	newt>=0.51.6nb2
+BUILDLINK_API_DEPENDS.newt+=	newt>=0.51.6
+BUILDLINK_ABI_DEPENDS.newt?=	newt>=0.51.6nb2
 BUILDLINK_PKGSRCDIR.newt?=	../../devel/newt
 .endif	# NEWT_BUILDLINK3_MK
 
Index: ./devel/nspr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/nspr/buildlink3.mk	5 Feb 2006 23:08:49 -0000	1.4
+++ ./devel/nspr/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nspr
 
 .if !empty(NSPR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nspr+=	nspr>=4.4.1nb1
-BUILDLINK_RECOMMENDED.nspr+=	nspr>=4.6.1nb1
+BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb1
+BUILDLINK_ABI_DEPENDS.nspr+=	nspr>=4.6.1nb1
 BUILDLINK_PKGSRCDIR.nspr?=	../../devel/nspr
 
 BUILDLINK_FILES.nspr+=		lib/nspr/*
Index: ./devel/nss/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./devel/nss/Makefile	5 Feb 2006 23:08:49 -0000	1.12
+++ ./devel/nss/Makefile	4 Apr 2006 06:26:52 -0000
@@ -77,7 +77,7 @@
 	      "-lnss3 -lsmime3 -lssl3 -lsoftokn3 ${BUILDLINK_LIBS.pthread}"; \
 	} >${PREFIX}/lib/pkgconfig/nss.pc
 
-BUILDLINK_DEPENDS.nspr+=	nspr>=4.4.1nb2
+BUILDLINK_API_DEPENDS.nspr+=	nspr>=4.4.1nb2
 
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: ./devel/nss/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/nss/buildlink3.mk	5 Feb 2006 23:08:49 -0000	1.5
+++ ./devel/nss/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nss
 
 .if !empty(NSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nss+=		nss>=3.9.2nb1
-BUILDLINK_RECOMMENDED.nss+=	nss>=3.9.2nb4
+BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb1
+BUILDLINK_ABI_DEPENDS.nss+=	nss>=3.9.2nb4
 BUILDLINK_PKGSRCDIR.nss?=	../../devel/nss
 
 BUILDLINK_FILES.nss+=		lib/nss/*
Index: ./devel/oaf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/oaf/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/oaf/buildlink3.mk	5 Feb 2006 23:08:49 -0000	1.5
+++ ./devel/oaf/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	oaf
 
 .if !empty(OAF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.oaf+=		oaf>=0.6.10nb4
-BUILDLINK_RECOMMENDED.oaf+=	oaf>=0.6.10nb7
+BUILDLINK_API_DEPENDS.oaf+=		oaf>=0.6.10nb4
+BUILDLINK_ABI_DEPENDS.oaf+=	oaf>=0.6.10nb7
 BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
 .endif	# OAF_BUILDLINK3_MK
 
Index: ./devel/ode/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ode/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/ode/buildlink3.mk	10 Feb 2006 20:35:28 -0000	1.4
+++ ./devel/ode/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ode
 
 .if !empty(ODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ode+=		ode>=0.5nb2
-BUILDLINK_RECOMMENDED.ode?=	ode>=0.5nb2
+BUILDLINK_API_DEPENDS.ode+=		ode>=0.5nb2
+BUILDLINK_ABI_DEPENDS.ode?=	ode>=0.5nb2
 BUILDLINK_PKGSRCDIR.ode?=	../../devel/ode
 .endif	# ODE_BUILDLINK3_MK
 
Index: ./devel/ogre/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ogre/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/ogre/buildlink3.mk	5 Feb 2006 23:08:49 -0000	1.7
+++ ./devel/ogre/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ogre
 
 .if !empty(OGRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogre+=	ogre>=0.12.1nb1
-BUILDLINK_RECOMMENDED.ogre+=	ogre>=0.12.1nb6
+BUILDLINK_API_DEPENDS.ogre+=	ogre>=0.12.1nb1
+BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=0.12.1nb6
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 .endif	# OGRE_BUILDLINK3_MK
 
Index: ./devel/p5-glib2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p5-glib2/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./devel/p5-glib2/buildlink3.mk	5 Feb 2006 23:08:50 -0000	1.5
+++ ./devel/p5-glib2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	p5-glib2
 
 .if !empty(P5_GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.p5-glib2+=	p5-glib2>=1.103
-BUILDLINK_RECOMMENDED.p5-glib2?=	p5-glib2>=1.103nb1
+BUILDLINK_API_DEPENDS.p5-glib2+=	p5-glib2>=1.103
+BUILDLINK_ABI_DEPENDS.p5-glib2?=	p5-glib2>=1.103nb1
 BUILDLINK_PKGSRCDIR.p5-glib2?=	../../devel/p5-glib2
 .endif	# P5_GLIB2_BUILDLINK3_MK
 
Index: ./devel/pango/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- ./devel/pango/Makefile	14 Mar 2006 19:50:15 -0000	1.72
+++ ./devel/pango/Makefile	4 Apr 2006 06:26:52 -0000
@@ -40,8 +40,8 @@
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
Index: ./devel/pango/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pango/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./devel/pango/buildlink3.mk	5 Feb 2006 23:08:50 -0000	1.10
+++ ./devel/pango/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pango
 
 .if !empty(PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pango+=	pango>=1.6.0
-BUILDLINK_RECOMMENDED.pango+=	pango>=1.10.2nb2
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.6.0
+BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.10.2nb2
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 .endif	# PANGO_BUILDLINK3_MK
 
Index: ./devel/pccts/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pccts/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/pccts/buildlink3.mk	5 Feb 2006 23:08:50 -0000	1.2
+++ ./devel/pccts/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pccts
 
 .if !empty(PCCTS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pccts+=	pccts>=1.33.22
-BUILDLINK_RECOMMENDED.pccts?=	pccts>=1.33.22nb1
+BUILDLINK_API_DEPENDS.pccts+=	pccts>=1.33.22
+BUILDLINK_ABI_DEPENDS.pccts?=	pccts>=1.33.22nb1
 BUILDLINK_PKGSRCDIR.pccts?=	../../devel/pccts
 BUILDLINK_DEPMETHOD.pccts?=	build
 .endif	# PCCTS_BUILDLINK3_MK
Index: ./devel/pcre/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pcre/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./devel/pcre/buildlink3.mk	30 Aug 2005 12:34:07 -0000	1.7
+++ ./devel/pcre/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pcre
 
 .if !empty(PCRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcre+=	pcre>=3.4nb1
-BUILDLINK_RECOMMENDED.pcre+=	pcre>=6.2
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=3.4nb1
+BUILDLINK_ABI_DEPENDS.pcre+=	pcre>=6.2
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 .endif	# PCRE_BUILDLINK3_MK
 
Index: ./devel/pcre++/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pcre++/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/pcre++/buildlink3.mk	26 Dec 2004 22:09:50 -0000	1.1.1.1
+++ ./devel/pcre++/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	pcrexx
 
 .if !empty(PCRE++_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pcrexx+=	pcre++>=0.9.5
+BUILDLINK_API_DEPENDS.pcrexx+=	pcre++>=0.9.5
 BUILDLINK_PKGSRCDIR.pcrexx?=	../../devel/pcre++
 .endif	# PCRE++_BUILDLINK3_MK
 
Index: ./devel/physfs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/physfs/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/physfs/buildlink3.mk	25 Jul 2005 12:12:53 -0000	1.6
+++ ./devel/physfs/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	physfs
 
 .if !empty(PHYSFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.physfs+=	physfs>=1.0.0
-BUILDLINK_RECOMMENDED.physfs+=	physfs>=1.0.1
+BUILDLINK_API_DEPENDS.physfs+=	physfs>=1.0.0
+BUILDLINK_ABI_DEPENDS.physfs+=	physfs>=1.0.1
 BUILDLINK_PKGSRCDIR.physfs?=	../../devel/physfs
 .endif	# PHYSFS_BUILDLINK3_MK
 
Index: ./devel/pth/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pth/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./devel/pth/buildlink3.mk	3 Oct 2004 00:13:32 -0000	1.6
+++ ./devel/pth/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pth
 
 .if !empty(PTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pth+=		pth>=2.0.0
-BUILDLINK_RECOMMENDED.pth+=	pth>=2.0.0nb2
+BUILDLINK_API_DEPENDS.pth+=		pth>=2.0.0
+BUILDLINK_ABI_DEPENDS.pth+=	pth>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 .endif	# PTH_BUILDLINK3_MK
 
Index: ./devel/popt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/popt/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/popt/buildlink3.mk	5 Feb 2006 23:08:50 -0000	1.8
+++ ./devel/popt/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	popt
 
 .if !empty(POPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.popt+=	popt>=1.7nb3
-BUILDLINK_RECOMMENDED.popt+=	popt>=1.7nb6
+BUILDLINK_API_DEPENDS.popt+=	popt>=1.7nb3
+BUILDLINK_ABI_DEPENDS.popt+=	popt>=1.7nb6
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
 .endif	# POPT_BUILDLINK3_MK
 
Index: ./devel/pthread-sem/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pthread-sem/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/pthread-sem/buildlink3.mk	5 Mar 2004 19:25:12 -0000	1.3
+++ ./devel/pthread-sem/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	pthread-sem
 
 .if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-sem+=		pthread-sem>=1.0
+BUILDLINK_API_DEPENDS.pthread-sem+=		pthread-sem>=1.0
 BUILDLINK_PKGSRCDIR.pthread-sem?=	../../devel/pthread-sem
 .endif	# PTHREAD_SEM_BUILDLINK3_MK
 
Index: ./devel/pthread-stublib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pthread-stublib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/pthread-stublib/buildlink3.mk	23 Mar 2006 11:40:30 -0000	1.2
+++ ./devel/pthread-stublib/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	pthread-stublib
 
 .if !empty(PTHREAD_STUBLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pthread-stublib+=	pthread-stublib>=1.0
+BUILDLINK_API_DEPENDS.pthread-stublib+=	pthread-stublib>=1.0
 BUILDLINK_PKGSRCDIR.pthread-stublib?=	../../devel/pthread-stublib
 .endif	# PTHREAD_STUBLIB_BUILDLINK3_MK
 
Index: ./devel/pwlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/pwlib/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./devel/pwlib/buildlink3.mk	5 Feb 2006 23:08:50 -0000	1.8
+++ ./devel/pwlib/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pwlib
 
 .if !empty(PWLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pwlib+=	pwlib>=1.8.3nb1
-BUILDLINK_RECOMMENDED.pwlib?=	pwlib>=1.8.3nb3
+BUILDLINK_API_DEPENDS.pwlib+=	pwlib>=1.8.3nb1
+BUILDLINK_ABI_DEPENDS.pwlib?=	pwlib>=1.8.3nb3
 BUILDLINK_PKGSRCDIR.pwlib?=	../../devel/pwlib
 .endif	# PWLIB_BUILDLINK3_MK
 
Index: ./devel/py-curses/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-curses/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./devel/py-curses/Makefile	5 Feb 2006 23:08:51 -0000	1.29
+++ ./devel/py-curses/Makefile	4 Apr 2006 06:26:52 -0000
@@ -20,7 +20,7 @@
 
 PY_SETUP_SUBST=	NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses}
 
-BUILDLINK_DEPENDS.python23+=	python23>=2.3nb2
+BUILDLINK_API_DEPENDS.python23+=	python23>=2.3nb2
 
 # ignore errors due to missing files (EXTRACT_ELEMENTS!)
 do-patch:
Index: ./devel/py-curses/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-curses/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/py-curses/buildlink3.mk	5 Feb 2006 23:08:51 -0000	1.2
+++ ./devel/py-curses/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pycurses
 
 .if !empty(PY_CURSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses-[0-9]*
-BUILDLINK_RECOMMENDED.pycurses?=	${PYPKGPREFIX}-curses>=0nb4
+BUILDLINK_API_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycurses?=	${PYPKGPREFIX}-curses>=0nb4
 BUILDLINK_PKGSRCDIR.pycurses?=	../../devel/py-curses
 .endif	# PY_CURSES_BUILDLINK3_MK
 
Index: ./devel/py-cursespanel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-cursespanel/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/py-cursespanel/buildlink3.mk	5 Feb 2006 23:08:51 -0000	1.2
+++ ./devel/py-cursespanel/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pycursespanel
 
 .if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
-BUILDLINK_RECOMMENDED.pycursespanel?=	${PYPKGPREFIX}-cursespanel>=0nb3
+BUILDLINK_API_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
+BUILDLINK_ABI_DEPENDS.pycursespanel?=	${PYPKGPREFIX}-cursespanel>=0nb3
 BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
 .endif	# PY_CURSESPANEL_BUILDLINK3_MK
 
Index: ./devel/py-game/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-game/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/py-game/buildlink3.mk	5 Feb 2006 23:08:51 -0000	1.3
+++ ./devel/py-game/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-game
 
 .if !empty(PY_GAME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.7.1nb2
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.7.1nb2
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
Index: ./devel/py-gobject/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-gobject/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/py-gobject/buildlink3.mk	7 Feb 2006 18:59:59 -0000	1.1.1.1
+++ ./devel/py-gobject/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	pygobject
 
 .if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.9.1
+BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.9.1
 BUILDLINK_PKGSRCDIR.pygobject?=	../../devel/py-gobject
 .endif	# PY_GOBJECT_BUILDLINK3_MK
 
Index: ./devel/py-readline/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/py-readline/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/py-readline/buildlink3.mk	5 Feb 2006 23:08:51 -0000	1.2
+++ ./devel/py-readline/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -14,8 +14,8 @@
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pyreadline+=		${PYPKGPREFIX}-readline-[0-9]*
-BUILDLINK_RECOMMENDED.pyreadline?=	${PYPKGPREFIX}-readline>=0nb2
+BUILDLINK_API_DEPENDS.pyreadline+=		${PYPKGPREFIX}-readline-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreadline?=	${PYPKGPREFIX}-readline>=0nb2
 BUILDLINK_PKGSRCDIR.pyreadline?=	../../devel/py-readline
 
 .endif	# PYREADLINE_BUILDLINK3_MK
Index: ./devel/readline/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/buildlink3.mk,v
retrieving revision 1.21
diff -u -r1.21 buildlink3.mk
--- ./devel/readline/buildlink3.mk	4 Nov 2005 16:53:24 -0000	1.21
+++ ./devel/readline/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	readline
 
 .if !empty(READLINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.readline+=		readline>=2.2
-BUILDLINK_RECOMMENDED.readline+=	readline>=5.0
+BUILDLINK_API_DEPENDS.readline+=		readline>=2.2
+BUILDLINK_ABI_DEPENDS.readline+=	readline>=5.0
 BUILDLINK_PKGSRCDIR.readline?=		../../devel/readline
 
 BUILDLINK_FILES.readline+=	include/history.h
Index: ./devel/readline/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/builtin.mk,v
retrieving revision 1.11
diff -u -r1.11 builtin.mk
--- ./devel/readline/builtin.mk	1 Jul 2005 17:24:02 -0000	1.11
+++ ./devel/readline/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -51,7 +51,7 @@
 .    if defined(BUILTIN_PKG.readline) && \
         !empty(IS_BUILTIN.readline:M[yY][eE][sS])
 USE_BUILTIN.readline=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.readline}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.readline}
 .        if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
 USE_BUILTIN.readline!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.readline:Q}; then \
Index: ./devel/rpc2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rpc2/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/rpc2/buildlink3.mk	5 Feb 2006 23:08:52 -0000	1.3
+++ ./devel/rpc2/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rpc2
 
 .if !empty(RPC2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpc2+=	rpc2>=1.10
-BUILDLINK_RECOMMENDED.rpc2+=	rpc2>=1.27nb1
+BUILDLINK_API_DEPENDS.rpc2+=	rpc2>=1.10
+BUILDLINK_ABI_DEPENDS.rpc2+=	rpc2>=1.27nb1
 BUILDLINK_PKGSRCDIR.rpc2?=	../../devel/rpc2
 .endif	# RPC2_BUILDLINK3_MK
 
Index: ./devel/ruby-gnome2-pango/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ruby-gnome2-pango/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/ruby-gnome2-pango/buildlink3.mk	5 Feb 2006 23:08:53 -0000	1.4
+++ ./devel/ruby-gnome2-pango/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ruby-gnome2-pango
 
 .if !empty(RUBY_GNOME2_PANGO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby-gnome2-pango+=	ruby-gnome2-pango>=0.14.1
-BUILDLINK_RECOMMENDED.ruby-gnome2-pango?=	ruby-gnome2-pango>=0.14.1nb2
+BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	ruby-gnome2-pango>=0.14.1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?=	ruby-gnome2-pango>=0.14.1nb2
 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=	../../devel/ruby-gnome2-pango
 .endif	# RUBY_GNOME2_PANGO_BUILDLINK3_MK
 
Index: ./devel/rudiments/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rudiments/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/rudiments/buildlink3.mk	11 Mar 2006 02:41:51 -0000	1.4
+++ ./devel/rudiments/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -14,8 +14,8 @@
 
 .if !empty(RUDIMENTS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			rudiments
-BUILDLINK_DEPENDS.rudiments+=		rudiments>=0.25.1
-BUILDLINK_RECOMMENDED.rudiments+=	rudiments>=0.28.2nb1
+BUILDLINK_API_DEPENDS.rudiments+=		rudiments>=0.25.1
+BUILDLINK_ABI_DEPENDS.rudiments+=	rudiments>=0.28.2nb1
 BUILDLINK_PKGSRCDIR.rudiments?=		../../devel/rudiments
 
 .endif # RUDIMENTS_BUILDLINK3_MK
Index: ./devel/rvm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rvm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/rvm/buildlink3.mk	5 Feb 2006 23:08:53 -0000	1.3
+++ ./devel/rvm/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rvm
 
 .if !empty(RVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rvm+=	rvm>=1.3
-BUILDLINK_RECOMMENDED.rvm+=	rvm>=1.11nb1
+BUILDLINK_API_DEPENDS.rvm+=	rvm>=1.3
+BUILDLINK_ABI_DEPENDS.rvm+=	rvm>=1.11nb1
 BUILDLINK_PKGSRCDIR.rvm?=	../../devel/rvm
 .endif	# RVM_BUILDLINK3_MK
 
Index: ./devel/rx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/rx/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/rx/buildlink3.mk	5 Mar 2004 19:25:12 -0000	1.2
+++ ./devel/rx/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	rx
 
 .if !empty(RX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rx+=		rx>=1.5
+BUILDLINK_API_DEPENDS.rx+=		rx>=1.5
 BUILDLINK_PKGSRCDIR.rx?=	../../devel/rx
 .endif	# RX_BUILDLINK3_MK
 
Index: ./devel/silc-toolkit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/silc-toolkit/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/silc-toolkit/buildlink3.mk	3 Oct 2004 00:13:33 -0000	1.2
+++ ./devel/silc-toolkit/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	silc-toolkit
 
 .if !empty(SILC_TOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12
-BUILDLINK_RECOMMENDED.silc-toolkit+=	silc-toolkit>=0.9.12nb1
+BUILDLINK_API_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12
+BUILDLINK_ABI_DEPENDS.silc-toolkit+=	silc-toolkit>=0.9.12nb1
 BUILDLINK_PKGSRCDIR.silc-toolkit?=	../../devel/silc-toolkit
 .endif	# SILC_TOOLKIT_BUILDLINK3_MK
 
Index: ./devel/subversion/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion/Makefile.common,v
retrieving revision 1.23
diff -u -r1.23 Makefile.common
--- ./devel/subversion/Makefile.common	4 Apr 2006 03:36:32 -0000	1.23
+++ ./devel/subversion/Makefile.common	4 Apr 2006 06:26:52 -0000
@@ -27,6 +27,6 @@
 # workaround: does not install info file, but does create directory
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 
-BUILDLINK_DEPENDS.subversion-base+=	subversion-base>=${SVNVER}
+BUILDLINK_API_DEPENDS.subversion-base+=	subversion-base>=${SVNVER}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./devel/subversion-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion-base/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- ./devel/subversion-base/Makefile	7 Feb 2006 19:55:56 -0000	1.32
+++ ./devel/subversion-base/Makefile	4 Apr 2006 06:26:52 -0000
@@ -15,8 +15,8 @@
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
-BUILDLINK_DEPENDS.apr+=		apr>=0.9.5
-BUILDLINK_DEPENDS.neon+=	neon>=0.24.7
+BUILDLINK_API_DEPENDS.apr+=		apr>=0.9.5
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.7
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
Index: ./devel/subversion-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/subversion-base/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./devel/subversion-base/buildlink3.mk	7 Feb 2006 19:58:06 -0000	1.1
+++ ./devel/subversion-base/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -14,8 +14,8 @@
 BUILDLINK_PACKAGES+=	subversion-base
 
 .if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.subversion-base+=	subversion-base>=1.0.0
-BUILDLINK_RECOMMENDED.subversion-base?=	subversion-base>=1.3.0nb2
+BUILDLINK_API_DEPENDS.subversion-base+=	subversion-base>=1.0.0
+BUILDLINK_ABI_DEPENDS.subversion-base?=	subversion-base>=1.3.0nb2
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
Index: ./devel/swig/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/swig/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./devel/swig/buildlink3.mk	5 Feb 2006 23:08:54 -0000	1.3
+++ ./devel/swig/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	swig
 
 .if !empty(SWIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swig+=	swig>=1.3.24
-BUILDLINK_RECOMMENDED.swig?=	swig>=1.3.24nb2
+BUILDLINK_API_DEPENDS.swig+=	swig>=1.3.24
+BUILDLINK_ABI_DEPENDS.swig?=	swig>=1.3.24nb2
 BUILDLINK_PKGSRCDIR.swig?=	../../devel/swig
 # only contains a static library
 BUILDLINK_DEPMETHOD.swig?=	build
Index: ./devel/syncdir/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/syncdir/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/syncdir/buildlink3.mk	3 Oct 2004 00:13:33 -0000	1.2
+++ ./devel/syncdir/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=		syncdir
 
 .if !empty(SYNCDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.syncdir+=	syncdir>=1.0
-BUILDLINK_RECOMMENDED.syncdir+=	syncdir>=1.0nb1
+BUILDLINK_API_DEPENDS.syncdir+=	syncdir>=1.0
+BUILDLINK_ABI_DEPENDS.syncdir+=	syncdir>=1.0nb1
 BUILDLINK_PKGSRCDIR.syncdir?=	../../devel/syncdir
 .endif	# SYNCDIR_BUILDLINK3_MK
 
Index: ./devel/sysexits/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/sysexits/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/sysexits/buildlink3.mk	8 Nov 2005 13:34:39 -0000	1.2
+++ ./devel/sysexits/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	sysexits
 
 .if !empty(SYSEXITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sysexits+=	sysexits>=1.1
+BUILDLINK_API_DEPENDS.sysexits+=	sysexits>=1.1
 BUILDLINK_DEPMETHOD.sysexits?=	build
 BUILDLINK_PKGSRCDIR.sysexits?=	../../devel/sysexits
 .endif	# SYSEXITS_BUILDLINK3_MK
Index: ./devel/sysexits/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/sysexits/builtin.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 builtin.mk
--- ./devel/sysexits/builtin.mk	31 Oct 2005 15:53:19 -0000	1.1.1.1
+++ ./devel/sysexits/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.sysexits) && \
         !empty(IS_BUILTIN.sysexits:M[yY][eE][sS])
 USE_BUILTIN.sysexits=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.sysexits}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.sysexits}
 .        if !empty(USE_BUILTIN.sysexits:M[yY][eE][sS])
 USE_BUILTIN.sysexits!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.sysexits:Q}; then \
Index: ./devel/tcl-tclcl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tcl-tclcl/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/tcl-tclcl/buildlink3.mk	5 Feb 2006 23:08:54 -0000	1.4
+++ ./devel/tcl-tclcl/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-tclcl
 
 .if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
-BUILDLINK_RECOMMENDED.tcl-tclcl+=	tcl-tclcl>=1.17nb2
+BUILDLINK_API_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.15
+BUILDLINK_ABI_DEPENDS.tcl-tclcl+=	tcl-tclcl>=1.17nb2
 BUILDLINK_PKGSRCDIR.tcl-tclcl?=	../../devel/tcl-tclcl
 .endif	# TCL_TCLCL_BUILDLINK3_MK
 
Index: ./devel/teem/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/teem/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/teem/buildlink3.mk	5 Feb 2006 23:08:54 -0000	1.2
+++ ./devel/teem/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	teem
 
 .if !empty(TEEM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teem+=		teem>=1.8.0
-BUILDLINK_RECOMMENDED.teem?=		teem>=1.8.0nb1
+BUILDLINK_API_DEPENDS.teem+=		teem>=1.8.0
+BUILDLINK_ABI_DEPENDS.teem?=		teem>=1.8.0nb1
 BUILDLINK_PKGSRCDIR.teem?=		../../devel/teem
 
 BUILDLINK_FILES.teem+=	include/teem/*
Index: ./devel/tre/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/tre/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./devel/tre/buildlink3.mk	29 Nov 2005 19:12:04 -0000	1.1.1.1
+++ ./devel/tre/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	tre
 
 .if !empty(TRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tre+=		tre>=0.7.2
+BUILDLINK_API_DEPENDS.tre+=		tre>=0.7.2
 BUILDLINK_PKGSRCDIR.tre?=	../../devel/tre
 BUILDLINK_DEPMETHOD.tre?=	build
 .endif	# TRE_BUILDLINK3_MK
Index: ./devel/ucl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/ucl/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/ucl/buildlink3.mk	3 Oct 2004 00:13:34 -0000	1.2
+++ ./devel/ucl/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ucl
 
 .if !empty(UCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ucl+=	ucl>=1.02
-BUILDLINK_RECOMMENDED.ucl+=	ucl>=1.02nb2
+BUILDLINK_API_DEPENDS.ucl+=	ucl>=1.02
+BUILDLINK_ABI_DEPENDS.ucl+=	ucl>=1.02nb2
 BUILDLINK_PKGSRCDIR.ucl?=	../../devel/ucl
 .endif	# UCL_BUILDLINK3_MK
 
Index: ./devel/vanessa_adt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/vanessa_adt/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/vanessa_adt/buildlink3.mk	3 Oct 2004 00:13:34 -0000	1.2
+++ ./devel/vanessa_adt/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	vanessa_adt
 
 .if !empty(VANESSA_ADT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6
-BUILDLINK_RECOMMENDED.vanessa_adt+=	vanessa_adt>=0.0.6nb1
+BUILDLINK_API_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6
+BUILDLINK_ABI_DEPENDS.vanessa_adt+=	vanessa_adt>=0.0.6nb1
 BUILDLINK_PKGSRCDIR.vanessa_adt?=	../../devel/vanessa_adt
 .endif	# VANESSA_ADT_BUILDLINK3_MK
 
Index: ./devel/vanessa_logger/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/vanessa_logger/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./devel/vanessa_logger/buildlink3.mk	3 Oct 2004 00:13:34 -0000	1.2
+++ ./devel/vanessa_logger/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	vanessa_logger
 
 .if !empty(VANESSA_LOGGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7
-BUILDLINK_RECOMMENDED.vanessa_logger+=	vanessa_logger>=0.0.7nb1
+BUILDLINK_API_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7
+BUILDLINK_ABI_DEPENDS.vanessa_logger+=	vanessa_logger>=0.0.7nb1
 BUILDLINK_PKGSRCDIR.vanessa_logger?=	../../devel/vanessa_logger
 .endif	# VANESSA_LOGGER_BUILDLINK3_MK
 
Index: ./devel/vanessa_socket/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/vanessa_socket/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./devel/vanessa_socket/buildlink3.mk	5 Feb 2006 23:08:54 -0000	1.4
+++ ./devel/vanessa_socket/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	vanessa_socket
 
 .if !empty(VANESSA_SOCKET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vanessa_socket+=	vanessa_socket>=0.0.7nb2
-BUILDLINK_RECOMMENDED.vanessa_socket?=	vanessa_socket>=0.0.7nb3
+BUILDLINK_API_DEPENDS.vanessa_socket+=	vanessa_socket>=0.0.7nb2
+BUILDLINK_ABI_DEPENDS.vanessa_socket?=	vanessa_socket>=0.0.7nb3
 BUILDLINK_PKGSRCDIR.vanessa_socket?=	../../devel/vanessa_socket
 .endif	# VANESSA_SOCKET_BUILDLINK3_MK
 
Index: ./devel/zlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/zlib/buildlink3.mk,v
retrieving revision 1.20
diff -u -r1.20 buildlink3.mk
--- ./devel/zlib/buildlink3.mk	22 Jul 2005 16:04:43 -0000	1.20
+++ ./devel/zlib/buildlink3.mk	4 Apr 2006 06:26:52 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	zlib
 
 .if !empty(ZLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.zlib+=	zlib>=1.1.4nb1
-BUILDLINK_RECOMMENDED.zlib+=	zlib>=1.2.3
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.1.4nb1
+BUILDLINK_ABI_DEPENDS.zlib+=	zlib>=1.2.3
 BUILDLINK_PKGSRCDIR.zlib?=	../../devel/zlib
 .endif	# ZLIB_BUILDLINK3_MK
 
Index: ./devel/zlib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/zlib/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./devel/zlib/builtin.mk	1 Jun 2005 18:02:45 -0000	1.3
+++ ./devel/zlib/builtin.mk	4 Apr 2006 06:26:52 -0000
@@ -69,7 +69,7 @@
 .    if defined(BUILTIN_PKG.zlib) && \
         !empty(IS_BUILTIN.zlib:M[yY][eE][sS])
 USE_BUILTIN.zlib=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.zlib}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.zlib}
 .        if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
 USE_BUILTIN.zlib!=	\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.zlib:Q}; then	\
Index: ./doc/guide/files/buildlink.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/buildlink.xml,v
retrieving revision 1.13
diff -u -r1.13 buildlink.xml
--- ./doc/guide/files/buildlink.xml	9 Mar 2006 21:45:51 -0000	1.13
+++ ./doc/guide/files/buildlink.xml	4 Apr 2006 06:26:52 -0000
@@ -85,7 +85,7 @@
     </para>
 
 <programlisting>
-    BUILDLINK_DEPENDS.foo+=   foo>=1.1.0
+    BUILDLINK_API_DEPENDS.foo+=   foo>=1.1.0
     .include "../../category/foo/buildlink3.mk"
 </programlisting>
 
@@ -197,7 +197,7 @@
     BUILDLINK_PACKAGES+=    tiff
 
     .if !empty(TIFF_BUILDLINK3_MK:M+)
-    BUILDLINK_DEPENDS.tiff+=        tiff>=3.6.1
+    BUILDLINK_API_DEPENDS.tiff+=        tiff>=3.6.1
     BUILDLINK_PKGSRCDIR.tiff?=      ../../graphics/tiff
     .endif  # TIFF_BUILDLINK3_MK
 
@@ -235,7 +235,7 @@
 
       <itemizedlist>
         <listitem>
-	  <para> <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+	  <para> <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
 	    is the actual dependency recorded in the installed
             package; this should always be set using
 	    <command>+=</command> to ensure that
@@ -363,12 +363,12 @@
     </sect2>
 
     <sect2 id="updating-buildlink-depends">
-      <title>Updating <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname> in <filename>buildlink3.mk</filename> files</title>
+      <title>Updating <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname> in <filename>buildlink3.mk</filename> files</title>
 
       <para>
         There are two situations that require increasing the
 	dependency listed in
-	<varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+	<varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
 	after a package update: </para>
 
       <orderedlist>
@@ -383,27 +383,27 @@
       </orderedlist>
 
       <para> In these cases,
-	<varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+	<varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
 	should be adjusted to require at least the new package
 	version.  In some cases, the packages that depend on this new
 	version may need their <varname>PKGREVISION</varname>s
 	increased and, if they have <filename>buildlink3.mk</filename>
 	files, their
-	<varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+	<varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
 	adjusted, too. This is needed so that binary packages made
 	using it will require the correct package dependency and not
 	settle for an older one which will not contain the necessary
 	shared libraries. </para>
 
       <para> Please take careful consideration before adjusting
-	<varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>
+	<varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>
 	as we don't want to cause unneeded package deletions and
 	rebuilds.  In many cases, new versions of packages work just
 	fine with older dependencies.  See <xref
 	linkend="dependencies"/> for
 	more information about dependencies on other packages,
-	including the <varname>BUILDLINK_RECOMMENDED</varname> and
-	<varname>RECOMMENDED</varname> definitions. </para>
+	including the <varname>BUILDLINK_ABI_DEPENDS</varname> and
+	<varname>ABI_DEPENDS</varname> definitions. </para>
     </sect2>
   </sect1>
 
@@ -473,7 +473,7 @@
     .if !defined(USE_BUILTIN.foo)
     USE_BUILTIN.foo?=       ${IS_BUILTIN.foo}
     .  if defined(BUILTIN_PKG.foo)
-    .    for _depend_ in ${BUILDLINK_DEPENDS.foo}
+    .    for _depend_ in ${BUILDLINK_API_DEPENDS.foo}
     .      if !empty(USE_BUILTIN.foo:M[yY][eE][sS])
     USE_BUILTIN.foo!=                                                       \
           if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.foo}; then     \
@@ -519,11 +519,11 @@
         <filename>builtin.mk</filename> files.  The code in this
         section must make the determination whether the built-in
         software is adequate to satisfy the dependencies listed in
-        <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>.
+        <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>.
         This is typically done by comparing
         <varname>BUILTIN_PKG.<replaceable>pkg</replaceable></varname>
         against each of the dependencies in
-        <varname>BUILDLINK_DEPENDS.<replaceable>pkg</replaceable></varname>.
+        <varname>BUILDLINK_API_DEPENDS.<replaceable>pkg</replaceable></varname>.
         <varname>USE_BUILTIN.<replaceable>pkg</replaceable></varname>
         <emphasis>must</emphasis> be set to the correct value by the
         end of the <filename>builtin.mk</filename> file.  Note that
Index: ./doc/guide/files/configuring.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/configuring.xml,v
retrieving revision 1.12
diff -u -r1.12 configuring.xml
--- ./doc/guide/files/configuring.xml	28 Feb 2006 11:50:07 -0000	1.12
+++ ./doc/guide/files/configuring.xml	4 Apr 2006 06:26:52 -0000
@@ -106,7 +106,7 @@
   <sect1 id="developer-advanced-settings">
     <title>Developer/advanced settings</title>
 
-    <!--	IGNORE_RECOMMENDED -->
+    <!--	USE_ABI_DEPENDS -->
     <para>XXX
       <itemizedlist>
 	<listitem><para><varname>PKG_DEVELOPER</varname>:
Index: ./doc/guide/files/fixes.xml
===================================================================
RCS file: /cvsroot/pkgsrc/doc/guide/files/fixes.xml,v
retrieving revision 1.48
diff -u -r1.48 fixes.xml
--- ./doc/guide/files/fixes.xml	20 Mar 2006 01:48:57 -0000	1.48
+++ ./doc/guide/files/fixes.xml	4 Apr 2006 06:26:53 -0000
@@ -221,25 +221,25 @@
 
           <para>Please note that such dependencies should only be
             updated if a package requires  a newer pre-requisite, but
-            not to denote recommendations such as security  updates or
+            not to denote recommendations such as 
             ABI changes that do not prevent a package from building
             correctly.  Such recommendations can be expressed using
-            <varname>RECOMMENDED</varname>:</para>
+            <varname>ABI_DEPENDS</varname>:</para>
 
 <programlisting>
-    RECOMMENDED+=   tiff>=3.6.1:../../graphics/tiff
+    ABI_DEPENDS+=   tiff>=3.6.1:../../graphics/tiff
 </programlisting>
 
           <para>In addition to the above <varname>DEPENDS</varname>
             line, this denotes that while a package will build against
             tiff&gt;=3.5.4, at least version 3.6.1 is recommended.
-            <varname>RECOMMENDED</varname> entries will be turned into
+            <varname>ABI_DEPENDS</varname> entries will be turned into
             dependencies unless explicitly ignored (in which case a
             warning will be printed).</para>
 
-          <para>To ignore these dependency recommendations and just
+          <para>To ignore these ABI dependency recommendations and just
             use the required <varname>DEPENDS</varname>, set
-            <varname>IGNORE_RECOMMENDED=YES</varname>.   This may make
+            <varname>USE_ABI_DEPENDS=NO</varname>.   This may make
             it easier and faster to update packages built using pkgsrc,
             since older compatible dependencies can continue to be
             used. This is useful for people who watch their rebuilds
@@ -254,8 +254,7 @@
             different versions of binary packages installed.</para>
 
           <para>For security fixes, please update the package
-            vulnerabilities file as well as setting
-            <varname>RECOMMENDED</varname>, see <xref
+            vulnerabilities file. See <xref
             linkend="security-handling"/> for more
             information.</para>
 	</listitem>
@@ -379,11 +378,7 @@
       <para>After fixing the vulnerability by a patch, its
 	<varname>PKGREVISION</varname> should be increased (this
 	is of course not necessary if the problem is fixed by using
-	a newer release of the software).  In addition, if a
-	<filename>buildlink3.mk</filename> file exists for an
-	affected package, a corresponding
-        <varname>BUILDLINK_RECOMMENDED.<replaceable>pkg</replaceable></varname>
-	entry should be added or updated in it.</para>
+	a newer release of the software).</para>
 
       <para>Also, if the fix should be applied to the stable pkgsrc
         branch, be sure to submit a pullup request!</para>
Index: ./editors/emacs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/Makefile,v
retrieving revision 1.91
diff -u -r1.91 Makefile
--- ./editors/emacs/Makefile	20 Feb 2006 12:16:24 -0000	1.91
+++ ./editors/emacs/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 .include "../../graphics/tiff/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-tiff
 # need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_DEPENDS.libungif+=	libungif>=4.1.0.1
+BUILDLINK_API_DEPENDS.libungif+=	libungif>=4.1.0.1
 .include "../../graphics/libungif/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gif
 .include "../../graphics/png/buildlink3.mk"
Index: ./editors/gconf-editor/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/gconf-editor/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- ./editors/gconf-editor/Makefile	21 Mar 2006 06:00:45 -0000	1.44
+++ ./editors/gconf-editor/Makefile	4 Apr 2006 06:26:53 -0000
@@ -24,7 +24,7 @@
 
 GCONF2_SCHEMAS=		gconf-editor.schemas
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.10.0
+BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.10.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./editors/gedit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/gedit/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- ./editors/gedit/Makefile	21 Mar 2006 06:00:45 -0000	1.58
+++ ./editors/gedit/Makefile	4 Apr 2006 06:26:53 -0000
@@ -26,8 +26,8 @@
 
 CONFIGURE_ARGS+=	--enable-schemas-install
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.4.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/eel2/buildlink3.mk"
Index: ./editors/gedit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/gedit/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./editors/gedit/buildlink3.mk	14 Mar 2006 14:22:36 -0000	1.1
+++ ./editors/gedit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	gedit
 
 .if !empty(GEDIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gedit+=	gedit>=2.12.1nb4
+BUILDLINK_API_DEPENDS.gedit+=	gedit>=2.12.1nb4
 BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 .endif	# GEDIT_BUILDLINK3_MK
 
Index: ./editors/mule-ucs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/mule-ucs/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./editors/mule-ucs/Makefile	5 Feb 2006 23:08:57 -0000	1.14
+++ ./editors/mule-ucs/Makefile	4 Apr 2006 06:26:53 -0000
@@ -12,7 +12,7 @@
 
 # Mule 4.1 feature required by Mule-UCS was added to 20.7nb1.
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20
-BUILDLINK_DEPENDS.emacs20+=	emacs>=20.7nb1
+BUILDLINK_API_DEPENDS.emacs20+=	emacs>=20.7nb1
 
 do-build:
 	@cd ${WRKSRC}; \
Index: ./editors/pico/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- ./editors/pico/Makefile	4 Mar 2006 21:29:32 -0000	1.68
+++ ./editors/pico/Makefile	4 Apr 2006 06:26:53 -0000
@@ -4,7 +4,7 @@
 # When updating, it is necessary to change the shlib version, located in
 # several files in patches/.  If you do not KNOW that the new version is
 # backwards ABI compatible (usually not), bump the major version,
-# and then bump the BUILDLINK_DEPENDS in buildlink3.mk.
+# and then bump the BUILDLINK_API_DEPENDS in buildlink3.mk.
 
 DISTNAME=	pine4.64
 PKGNAME=	pico-4.10
Index: ./editors/pico/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/pico/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./editors/pico/buildlink3.mk	12 Jan 2006 21:00:52 -0000	1.8
+++ ./editors/pico/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	pico
 
 .if !empty(PICO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pico+=	pico>=4.10
+BUILDLINK_API_DEPENDS.pico+=	pico>=4.10
 BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
 .endif	# PICO_BUILDLINK3_MK
 
Index: ./editors/sam/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/editors/sam/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./editors/sam/buildlink3.mk	5 Feb 2006 23:08:57 -0000	1.2
+++ ./editors/sam/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sam
 
 .if !empty(SAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sam+=	sam>=4.3nb1
-BUILDLINK_RECOMMENDED.sam?=	sam>=4.3nb3
+BUILDLINK_API_DEPENDS.sam+=	sam>=4.3nb1
+BUILDLINK_ABI_DEPENDS.sam?=	sam>=4.3nb3
 BUILDLINK_PKGSRCDIR.sam?=	../../editors/sam
 BUILDLINK_DEPMETHOD.sam?=	build
 .endif	# SAM_BUILDLINK3_MK
Index: ./emulators/DatLib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/DatLib/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./emulators/DatLib/buildlink3.mk	5 Feb 2006 23:08:59 -0000	1.3
+++ ./emulators/DatLib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	DatLib
 
 .if !empty(DATLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.8
-BUILDLINK_RECOMMENDED.DatLib?=	DatLib>=2.15nb1
+BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.8
+BUILDLINK_ABI_DEPENDS.DatLib?=	DatLib>=2.15nb1
 BUILDLINK_PKGSRCDIR.DatLib?=	../../emulators/DatLib
 .endif	# DATLIB_BUILDLINK3_MK
 
Index: ./emulators/DatUtil/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/DatUtil/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- ./emulators/DatUtil/Makefile	5 Feb 2006 23:08:59 -0000	1.17
+++ ./emulators/DatUtil/Makefile	4 Apr 2006 06:26:53 -0000
@@ -20,7 +20,7 @@
 
 INSTALLATION_DIRS=	bin
 
-BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.15
+BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.15
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
Index: ./emulators/MAMEDiff/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/MAMEDiff/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./emulators/MAMEDiff/Makefile	5 Feb 2006 23:08:59 -0000	1.13
+++ ./emulators/MAMEDiff/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
-BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.13
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
Index: ./emulators/ROMInfo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ROMInfo/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./emulators/ROMInfo/Makefile	5 Feb 2006 23:09:00 -0000	1.10
+++ ./emulators/ROMInfo/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
-BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.13
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
Index: ./emulators/ZIPIdent/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/ZIPIdent/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./emulators/ZIPIdent/Makefile	5 Feb 2006 23:09:00 -0000	1.10
+++ ./emulators/ZIPIdent/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 EXTRACT_OPTS_ZIP=	-Laaqo
 INSTALLATION_DIRS=	bin
 
-BUILDLINK_DEPENDS.DatLib+=	DatLib>=2.13
+BUILDLINK_API_DEPENDS.DatLib+=	DatLib>=2.13
 
 post-extract:
 	${MKDIR} ${WRKSRC}/obj
Index: ./emulators/cygwin_lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/cygwin_lib/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./emulators/cygwin_lib/buildlink3.mk	11 Oct 2004 20:08:11 -0000	1.1.1.1
+++ ./emulators/cygwin_lib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	cygwin_lib
 
 .if !empty(CYGWIN_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cygwin_lib+=		cygwin_lib>=1.5.11.1
+BUILDLINK_API_DEPENDS.cygwin_lib+=		cygwin_lib>=1.5.11.1
 BUILDLINK_PKGSRCDIR.cygwin_lib?=	../../emulators/cygwin_lib
 .endif	# CYGWIN_LIB_BUILDLINK3_MK
 
Index: ./emulators/gpsim-devel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/gpsim-devel/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./emulators/gpsim-devel/buildlink3.mk	5 Feb 2006 23:09:01 -0000	1.4
+++ ./emulators/gpsim-devel/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gpsim
 
 .if !empty(GPSIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpsim+=	gpsim>=20050905
-BUILDLINK_RECOMMENDED.gpsim+=	gpsim>=20050905nb2
+BUILDLINK_API_DEPENDS.gpsim+=	gpsim>=20050905
+BUILDLINK_ABI_DEPENDS.gpsim+=	gpsim>=20050905nb2
 BUILDLINK_PKGSRCDIR.gpsim?=	../../emulators/gpsim-devel
 .endif	# GPSIM_BUILDLINK3_MK
 
Index: ./emulators/libspectrum/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/libspectrum/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./emulators/libspectrum/buildlink3.mk	5 Feb 2006 23:09:01 -0000	1.6
+++ ./emulators/libspectrum/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libspectrum
 
 .if !empty(LIBSPECTRUM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libspectrum+=		libspectrum>=0.2.2
-BUILDLINK_RECOMMENDED.libspectrum+=	libspectrum>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libspectrum+=		libspectrum>=0.2.2
+BUILDLINK_ABI_DEPENDS.libspectrum+=	libspectrum>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.libspectrum?=	../../emulators/libspectrum
 .endif	# LIBSPECTRUM_BUILDLINK3_MK
 
Index: ./emulators/lrmi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/lrmi/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./emulators/lrmi/buildlink3.mk	5 Apr 2005 10:42:07 -0000	1.1
+++ ./emulators/lrmi/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	lrmi
 
 .if !empty(LRMI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lrmi+=	lrmi>=0.8nb1
+BUILDLINK_API_DEPENDS.lrmi+=	lrmi>=0.8nb1
 BUILDLINK_PKGSRCDIR.lrmi?=	../../emulators/lrmi
 .endif	# LRMI_BUILDLINK3_MK
 
Index: ./emulators/simh/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./emulators/simh/Makefile	4 Mar 2006 21:29:35 -0000	1.24
+++ ./emulators/simh/Makefile	4 Apr 2006 06:26:53 -0000
@@ -13,7 +13,7 @@
 HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supnik's historical computer simulator
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
 
 EXTRACT_OPTS_ZIP=	-aoq
 WRKSRC=			${WRKDIR}
Index: ./emulators/wine/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/wine/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./emulators/wine/buildlink3.mk	5 Feb 2006 23:09:05 -0000	1.5
+++ ./emulators/wine/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	wine
 
 .if !empty(WINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wine+=	wine>=0.9nb1
-BUILDLINK_RECOMMENDED.wine?=	wine>=0.9.6nb1
+BUILDLINK_API_DEPENDS.wine+=	wine>=0.9nb1
+BUILDLINK_ABI_DEPENDS.wine?=	wine>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .endif	# WINE_BUILDLINK3_MK
 
Index: ./finance/gnucash-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/finance/gnucash-devel/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./finance/gnucash-devel/Makefile	29 Mar 2006 22:07:22 -0000	1.9
+++ ./finance/gnucash-devel/Makefile	4 Apr 2006 06:26:53 -0000
@@ -51,20 +51,20 @@
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-BUILDLINK_DEPENDS.pango+=	pango>=1.8.0
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.0
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../finance/libofx/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
-BUILDLINK_DEPENDS.goffice+=	goffice>=0.1.2
+BUILDLINK_API_DEPENDS.goffice+=	goffice>=0.1.2
 .include "../../misc/goffice/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../www/gtkhtml38/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./finance/libofx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/finance/libofx/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./finance/libofx/buildlink3.mk	5 Feb 2006 22:25:01 -0000	1.1.1.1
+++ ./finance/libofx/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libofx
 
 .if !empty(LIBOFX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libofx+=	libofx>=0.8.0
+BUILDLINK_API_DEPENDS.libofx+=	libofx>=0.8.0
 BUILDLINK_PKGSRCDIR.libofx?=	../../finance/libofx
 .endif	# LIBOFX_BUILDLINK3_MK
 
Index: ./finance/xquote/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/finance/xquote/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./finance/xquote/Makefile	5 Feb 2006 23:09:06 -0000	1.14
+++ ./finance/xquote/Makefile	4 Apr 2006 06:26:53 -0000
@@ -13,7 +13,7 @@
 NO_INSTALL_MANPAGES=	YES
 
 # needs a symbol that appeared after 4.9.1
-BUILDLINK_DEPENDS.Xbae+=        Xbae>=4.50
+BUILDLINK_API_DEPENDS.Xbae+=        Xbae>=4.50
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/Xbae/buildlink3.mk"
Index: ./fonts/Xft2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- ./fonts/Xft2/Makefile	4 Mar 2006 21:29:38 -0000	1.45
+++ ./fonts/Xft2/Makefile	4 Apr 2006 06:26:53 -0000
@@ -20,8 +20,8 @@
 PKGCONFIG_OVERRIDE=	xft.pc.in
 MAKE_ENV+=		EGREP=${EGREP:Q}
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8.2
-BUILDLINK_DEPENDS.fontconfig+=	fontconfig>=2.2
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8.2
+BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.2
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
Index: ./fonts/Xft2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./fonts/Xft2/buildlink3.mk	5 Feb 2006 23:09:06 -0000	1.15
+++ ./fonts/Xft2/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xft2
 
 .if !empty(XFT2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1
-BUILDLINK_RECOMMENDED.Xft2+=	Xft2>=2.1.7nb2
+BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1
+BUILDLINK_ABI_DEPENDS.Xft2+=	Xft2>=2.1.7nb2
 BUILDLINK_PKGSRCDIR.Xft2?=	../../fonts/Xft2
 .endif	# XFT2_BUILDLINK3_MK
 
Index: ./fonts/Xft2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/Xft2/builtin.mk,v
retrieving revision 1.12
diff -u -r1.12 builtin.mk
--- ./fonts/Xft2/builtin.mk	3 Jun 2005 19:13:35 -0000	1.12
+++ ./fonts/Xft2/builtin.mk	4 Apr 2006 06:26:53 -0000
@@ -67,7 +67,7 @@
 .    if defined(BUILTIN_PKG.Xft2) && \
         !empty(IS_BUILTIN.Xft2:M[yY][eE][sS])
 USE_BUILTIN.Xft2=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xft2}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xft2}
 .        if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
 USE_BUILTIN.Xft2!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xft2:Q}; then	\
@@ -90,7 +90,7 @@
 .if !empty(CHECK_BUILTIN.Xft2:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.Xft2:M[nN][oO])
-BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1nb2
+BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1nb2
 .  endif
 
 .  if !empty(USE_BUILTIN.Xft2:M[yY][eE][sS])
Index: ./fonts/fontconfig/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- ./fonts/fontconfig/Makefile	4 Mar 2006 21:29:38 -0000	1.50
+++ ./fonts/fontconfig/Makefile	4 Apr 2006 06:26:53 -0000
@@ -12,7 +12,7 @@
 
 # This can use 2.0.5 but things which use it (ala pango) require 2.0.9 so make
 # sure to keep in step
-BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.0.9
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.0.9
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
Index: ./fonts/fontconfig/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/buildlink3.mk,v
retrieving revision 1.20
diff -u -r1.20 buildlink3.mk
--- ./fonts/fontconfig/buildlink3.mk	5 Feb 2006 23:09:09 -0000	1.20
+++ ./fonts/fontconfig/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fontconfig
 
 .if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fontconfig+=		fontconfig>=1.0.1
-BUILDLINK_RECOMMENDED.fontconfig+=	fontconfig>=2.3.2nb2
+BUILDLINK_API_DEPENDS.fontconfig+=		fontconfig>=1.0.1
+BUILDLINK_ABI_DEPENDS.fontconfig+=	fontconfig>=2.3.2nb2
 BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
 .endif	# FONTCONFIG_BUILDLINK3_MK
 
Index: ./fonts/fontconfig/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/fontconfig/builtin.mk,v
retrieving revision 1.7
diff -u -r1.7 builtin.mk
--- ./fonts/fontconfig/builtin.mk	3 Jun 2005 19:12:49 -0000	1.7
+++ ./fonts/fontconfig/builtin.mk	4 Apr 2006 06:26:53 -0000
@@ -66,7 +66,7 @@
 .    if defined(BUILTIN_PKG.fontconfig) && \
         !empty(IS_BUILTIN.fontconfig:M[yY][eE][sS])
 USE_BUILTIN.fontconfig=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.fontconfig}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.fontconfig}
 .        if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
 USE_BUILTIN.fontconfig!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fontconfig:Q}; then \
@@ -89,8 +89,8 @@
 .if !empty(CHECK_BUILTIN.fontconfig:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.fontconfig:M[nN][oO])
-BUILDLINK_DEPENDS.fontconfig+=	fontconfig>=2.1nb2
-BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1nb2
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.3
 .  endif
 
 .  if !empty(USE_BUILTIN.fontconfig:M[yY][eE][sS])
Index: ./fonts/gucharmap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/gucharmap/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./fonts/gucharmap/buildlink3.mk	5 Feb 2006 23:09:09 -0000	1.10
+++ ./fonts/gucharmap/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gucharmap
 
 .if !empty(GUCHARMAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gucharmap+=	gucharmap>=1.4.0
-BUILDLINK_RECOMMENDED.gucharmap+=	gucharmap>=1.4.4nb3
+BUILDLINK_API_DEPENDS.gucharmap+=	gucharmap>=1.4.0
+BUILDLINK_ABI_DEPENDS.gucharmap+=	gucharmap>=1.4.4nb3
 BUILDLINK_PKGSRCDIR.gucharmap?=	../../fonts/gucharmap
 .endif	# GUCHARMAP_BUILDLINK3_MK
 
Index: ./fonts/mftrace/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/mftrace/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./fonts/mftrace/buildlink3.mk	5 Feb 2006 23:09:10 -0000	1.3
+++ ./fonts/mftrace/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mftrace
 
 .if !empty(MFTRACE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mftrace+=	mftrace>=1.0.19
-BUILDLINK_RECOMMENDED.mftrace?=	mftrace>=1.1.1nb3
+BUILDLINK_API_DEPENDS.mftrace+=	mftrace>=1.0.19
+BUILDLINK_ABI_DEPENDS.mftrace?=	mftrace>=1.1.1nb3
 BUILDLINK_PKGSRCDIR.mftrace?=	../../fonts/mftrace
 .endif	# MFTRACE_BUILDLINK3_MK
 
Index: ./fonts/t1lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/t1lib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./fonts/t1lib/buildlink3.mk	5 Feb 2006 23:09:11 -0000	1.5
+++ ./fonts/t1lib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	t1lib
 
 .if !empty(T1LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.t1lib+=	t1lib>=5.0.1
-BUILDLINK_RECOMMENDED.t1lib+=	t1lib>=5.1.0nb5
+BUILDLINK_API_DEPENDS.t1lib+=	t1lib>=5.0.1
+BUILDLINK_ABI_DEPENDS.t1lib+=	t1lib>=5.1.0nb5
 BUILDLINK_PKGSRCDIR.t1lib?=	../../fonts/t1lib
 .endif	# T1LIB_BUILDLINK3_MK
 
Index: ./games/freeciv-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/freeciv-server/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./games/freeciv-server/Makefile	5 Feb 2006 23:09:14 -0000	1.21
+++ ./games/freeciv-server/Makefile	4 Apr 2006 06:26:53 -0000
@@ -13,7 +13,7 @@
 LIBS+=			-ltermcap
 
 # Uses rl_filename_completion_function() which was introduced in readline-4.2
-BUILDLINK_DEPENDS.readline+=	readline>=4.2
+BUILDLINK_API_DEPENDS.readline+=	readline>=4.2
 
 .include "../../games/freeciv-share/Makefile.common"
 
Index: ./games/gnome2-games/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/gnome2-games/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- ./games/gnome2-games/Makefile	21 Mar 2006 06:00:45 -0000	1.65
+++ ./games/gnome2-games/Makefile	4 Apr 2006 06:26:53 -0000
@@ -59,10 +59,10 @@
 
 PYTHON_PATCH_SCRIPTS=	libgames-support/games-server.py
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
-BUILDLINK_DEPENDS.howl+=	howl>=0.9.6
-BUILDLINK_DEPENDS.libgnome+=	libgnome>=2.10.0
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.howl+=	howl>=0.9.6
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
+BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
Index: ./games/kdegames3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/games/kdegames3/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./games/kdegames3/buildlink3.mk	5 Feb 2006 23:09:16 -0000	1.6
+++ ./games/kdegames3/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdegames
 
 .if !empty(KDEGAMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegames+=	kdegames>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdegames?=	kdegames>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdegames+=	kdegames>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdegames?=	kdegames>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdegames?=	../../games/kdegames3
 .endif	# KDEGAMES_BUILDLINK3_MK
 
Index: ./games/plib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/games/plib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./games/plib/buildlink3.mk	5 Feb 2006 23:09:21 -0000	1.2
+++ ./games/plib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	plib
 
 .if !empty(PLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.plib+=	plib>=1.6.0
-BUILDLINK_RECOMMENDED.plib?=	plib>=1.6.0nb3
+BUILDLINK_API_DEPENDS.plib+=	plib>=1.6.0
+BUILDLINK_ABI_DEPENDS.plib?=	plib>=1.6.0nb3
 BUILDLINK_PKGSRCDIR.plib?=	../../games/plib
 BUILDLINK_DEPMETHOD.plib?=	build
 .endif	# PLIB_BUILDLINK3_MK
Index: ./games/wesnoth/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/wesnoth/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./games/wesnoth/Makefile	12 Mar 2006 12:30:05 -0000	1.27
+++ ./games/wesnoth/Makefile	4 Apr 2006 06:26:53 -0000
@@ -18,8 +18,8 @@
 REPLACE_PERL+=		utils/wmlxgettext
 USE_TOOLS+=		perl:run
 
-BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.7
-BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb3
+BUILDLINK_API_DEPENDS.SDL+=		SDL>=1.2.7
+BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb3
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
Index: ./geography/geos/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/geography/geos/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./geography/geos/buildlink3.mk	6 Nov 2005 10:36:46 -0000	1.1.1.1
+++ ./geography/geos/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	geos
 
 .if !empty(GEOS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.geos+=	geos>=2.0.0
+BUILDLINK_API_DEPENDS.geos+=	geos>=2.0.0
 BUILDLINK_PKGSRCDIR.geos?=	../../geography/geos
 .endif	# GEOS_BUILDLINK3_MK
 
Index: ./geography/shapelib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/geography/shapelib/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./geography/shapelib/buildlink3.mk	27 Mar 2005 21:18:06 -0000	1.1.1.1
+++ ./geography/shapelib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	shapelib
 
 .if !empty(SHAPELIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.shapelib+=	shapelib>=1.2.10
+BUILDLINK_API_DEPENDS.shapelib+=	shapelib>=1.2.10
 BUILDLINK_PKGSRCDIR.shapelib?=	../../geography/shapelib
 .endif	# SHAPELIB_BUILDLINK3_MK
 
Index: ./graphics/Coin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/Coin/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/Coin/buildlink3.mk	5 Feb 2006 23:09:26 -0000	1.3
+++ ./graphics/Coin/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -14,8 +14,8 @@
 
 .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"
Index: ./graphics/GLXKit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/GLXKit/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/GLXKit/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.4
+++ ./graphics/GLXKit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/GUIlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/GUIlib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/GUIlib/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.4
+++ ./graphics/GUIlib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/GeometryKit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/GeometryKit/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/GeometryKit/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.4
+++ ./graphics/GeometryKit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/GlutKit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/GlutKit/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/GlutKit/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.4
+++ ./graphics/GlutKit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/ImageMagick/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ImageMagick/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./graphics/ImageMagick/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.12
+++ ./graphics/ImageMagick/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/ImageMagick/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ImageMagick/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- ./graphics/ImageMagick/options.mk	8 Feb 2006 12:19:38 -0000	1.5
+++ ./graphics/ImageMagick/options.mk	4 Apr 2006 06:26:53 -0000
@@ -7,7 +7,7 @@
 .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"
Index: ./graphics/MesaLib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/buildlink3.mk,v
retrieving revision 1.33
diff -u -r1.33 buildlink3.mk
--- ./graphics/MesaLib/buildlink3.mk	21 Mar 2006 22:18:55 -0000	1.33
+++ ./graphics/MesaLib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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)
Index: ./graphics/MesaLib/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/builtin.mk,v
retrieving revision 1.12
diff -u -r1.12 builtin.mk
--- ./graphics/MesaLib/builtin.mk	19 Jan 2006 12:53:17 -0000	1.12
+++ ./graphics/MesaLib/builtin.mk	4 Apr 2006 06:26:53 -0000
@@ -45,7 +45,7 @@
 .    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 \
Index: ./graphics/OpenRM/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/OpenRM/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./graphics/OpenRM/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.7
+++ ./graphics/OpenRM/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/RenderKit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/RenderKit/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/RenderKit/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.4
+++ ./graphics/RenderKit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/SDLKit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/SDLKit/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/SDLKit/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.5
+++ ./graphics/SDLKit/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/SDL_image/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/SDL_image/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./graphics/SDL_image/buildlink3.mk	5 Feb 2006 23:09:27 -0000	1.11
+++ ./graphics/SDL_image/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
Index: ./graphics/TiffIO/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/TiffIO/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./graphics/TiffIO/Makefile	23 Mar 2006 03:25:12 -0000	1.8
+++ ./graphics/TiffIO/Makefile	4 Apr 2006 06:26:53 -0000
@@ -17,7 +17,7 @@
 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"
Index: ./graphics/aalib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/aalib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/aalib/buildlink3.mk	5 Feb 2006 23:09:28 -0000	1.5
+++ ./graphics/aalib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/cairo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./graphics/cairo/Makefile	5 Feb 2006 23:09:28 -0000	1.31
+++ ./graphics/cairo/Makefile	4 Apr 2006 06:26:53 -0000
@@ -30,11 +30,11 @@
 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"
 
Index: ./graphics/cairo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cairo/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./graphics/cairo/buildlink3.mk	5 Feb 2006 23:09:28 -0000	1.13
+++ ./graphics/cairo/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,13 +11,13 @@
 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"
Index: ./graphics/cal3d/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cal3d/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/cal3d/buildlink3.mk	5 Feb 2006 23:09:28 -0000	1.6
+++ ./graphics/cal3d/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/camlimages/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./graphics/camlimages/Makefile	4 Mar 2006 21:29:46 -0000	1.12
+++ ./graphics/camlimages/Makefile	4 Apr 2006 06:26:53 -0000
@@ -10,7 +10,7 @@
 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
Index: ./graphics/camlimages/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/camlimages/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/camlimages/buildlink3.mk	5 Feb 2006 23:09:28 -0000	1.4
+++ ./graphics/camlimages/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/cinepaint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/cinepaint/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./graphics/cinepaint/Makefile	17 Feb 2006 23:42:35 -0000	1.11
+++ ./graphics/cinepaint/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 
 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"
Index: ./graphics/compface/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/compface/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/compface/buildlink3.mk	5 Feb 2006 23:09:28 -0000	1.3
+++ ./graphics/compface/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/digikam/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/digikam/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./graphics/digikam/Makefile	30 Mar 2006 03:20:04 -0000	1.21
+++ ./graphics/digikam/Makefile	4 Apr 2006 06:26:53 -0000
@@ -17,8 +17,8 @@
 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"
Index: ./graphics/digikam/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/digikam/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./graphics/digikam/buildlink3.mk	20 Feb 2006 09:15:44 -0000	1.10
+++ ./graphics/digikam/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 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
 
Index: ./graphics/eog2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/eog2/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- ./graphics/eog2/Makefile	21 Mar 2006 06:00:46 -0000	1.54
+++ ./graphics/eog2/Makefile	4 Apr 2006 06:26:53 -0000
@@ -21,7 +21,7 @@
 
 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"
Index: ./graphics/epeg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/epeg/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./graphics/epeg/buildlink3.mk	28 Dec 2004 21:54:35 -0000	1.1.1.1
+++ ./graphics/epeg/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -10,7 +10,7 @@
 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
 
Index: ./graphics/feh/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/feh/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./graphics/feh/Makefile	5 Feb 2006 23:09:29 -0000	1.27
+++ ./graphics/feh/Makefile	4 Apr 2006 06:26:53 -0000
@@ -17,8 +17,8 @@
 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"
Index: ./graphics/fnlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/fnlib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/fnlib/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.5
+++ ./graphics/fnlib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/freeglut/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freeglut/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/freeglut/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.3
+++ ./graphics/freeglut/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/freetype-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype-lib/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./graphics/freetype-lib/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.10
+++ ./graphics/freetype-lib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,9 +11,9 @@
 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
 
Index: ./graphics/freetype-utils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype-utils/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./graphics/freetype-utils/Makefile	5 Feb 2006 23:09:30 -0000	1.18
+++ ./graphics/freetype-utils/Makefile	4 Apr 2006 06:26:53 -0000
@@ -6,7 +6,7 @@
 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
Index: ./graphics/freetype2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/buildlink3.mk,v
retrieving revision 1.25
diff -u -r1.25 buildlink3.mk
--- ./graphics/freetype2/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.25
+++ ./graphics/freetype2/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/freetype2/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/freetype2/builtin.mk,v
retrieving revision 1.7
diff -u -r1.7 builtin.mk
--- ./graphics/freetype2/builtin.mk	3 Jun 2005 19:12:49 -0000	1.7
+++ ./graphics/freetype2/builtin.mk	4 Apr 2006 06:26:53 -0000
@@ -51,7 +51,7 @@
 .    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 @@
 .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])
Index: ./graphics/gd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gd/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./graphics/gd/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.11
+++ ./graphics/gd/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gdchart/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gdchart/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/gdchart/buildlink3.mk	10 Feb 2006 12:17:05 -0000	1.4
+++ ./graphics/gdchart/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gdk-pixbuf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gdk-pixbuf/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./graphics/gdk-pixbuf/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.8
+++ ./graphics/gdk-pixbuf/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
Index: ./graphics/gdk-pixbuf-gnome/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gdk-pixbuf-gnome/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/gdk-pixbuf-gnome/buildlink3.mk	5 Feb 2006 23:09:30 -0000	1.4
+++ ./graphics/gdk-pixbuf-gnome/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gle/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gle/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/gle/buildlink3.mk	5 Feb 2006 23:09:31 -0000	1.6
+++ ./graphics/gle/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gimp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gimp/Makefile,v
retrieving revision 1.135
diff -u -r1.135 Makefile
--- ./graphics/gimp/Makefile	8 Mar 2006 09:50:12 -0000	1.135
+++ ./graphics/gimp/Makefile	4 Apr 2006 06:26:53 -0000
@@ -31,9 +31,9 @@
 .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
Index: ./graphics/gimp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gimp/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./graphics/gimp/buildlink3.mk	5 Feb 2006 23:09:31 -0000	1.7
+++ ./graphics/gimp/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gimp1-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gimp1-base/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/gimp1-base/buildlink3.mk	5 Feb 2006 23:09:31 -0000	1.5
+++ ./graphics/gimp1-base/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gimp24/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gimp24/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./graphics/gimp24/Makefile	6 Mar 2006 00:18:11 -0000	1.14
+++ ./graphics/gimp24/Makefile	4 Apr 2006 06:26:53 -0000
@@ -32,8 +32,8 @@
 .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
Index: ./graphics/gimp24/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gimp24/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./graphics/gimp24/buildlink3.mk	6 Mar 2006 00:18:11 -0000	1.7
+++ ./graphics/gimp24/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/glitz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glitz/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/glitz/buildlink3.mk	5 Feb 2006 23:09:31 -0000	1.6
+++ ./graphics/glitz/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/glu/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glu/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- ./graphics/glu/Makefile	9 Feb 2006 12:27:42 -0000	1.44
+++ ./graphics/glu/Makefile	4 Apr 2006 06:26:53 -0000
@@ -12,7 +12,7 @@
 
 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:
Index: ./graphics/glu/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glu/buildlink3.mk,v
retrieving revision 1.28
diff -u -r1.28 buildlink3.mk
--- ./graphics/glu/buildlink3.mk	5 Feb 2006 23:09:32 -0000	1.28
+++ ./graphics/glu/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/glu/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glu/builtin.mk,v
retrieving revision 1.9
diff -u -r1.9 builtin.mk
--- ./graphics/glu/builtin.mk	19 Jan 2006 12:53:17 -0000	1.9
+++ ./graphics/glu/builtin.mk	4 Apr 2006 06:26:53 -0000
@@ -45,7 +45,7 @@
 .    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 @@
 .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])
Index: ./graphics/glut/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glut/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- ./graphics/glut/Makefile	9 Feb 2006 12:27:42 -0000	1.43
+++ ./graphics/glut/Makefile	4 Apr 2006 06:26:53 -0000
@@ -8,8 +8,8 @@
 
 .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
 
Index: ./graphics/glut/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/glut/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./graphics/glut/buildlink3.mk	5 Feb 2006 23:09:32 -0000	1.10
+++ ./graphics/glut/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gnome-icon-theme/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gnome-icon-theme/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./graphics/gnome-icon-theme/Makefile	4 Mar 2006 21:29:48 -0000	1.34
+++ ./graphics/gnome-icon-theme/Makefile	4 Apr 2006 06:26:53 -0000
@@ -19,7 +19,7 @@
 
 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
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
Index: ./graphics/gnome-icon-theme/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gnome-icon-theme/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./graphics/gnome-icon-theme/buildlink3.mk	5 Feb 2006 23:09:32 -0000	1.7
+++ ./graphics/gnome-icon-theme/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
Index: ./graphics/graphviz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/graphviz/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/graphviz/buildlink3.mk	5 Feb 2006 23:09:32 -0000	1.6
+++ ./graphics/graphviz/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/gst-plugins0.8-opengl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gst-plugins0.8-opengl/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./graphics/gst-plugins0.8-opengl/Makefile	21 Mar 2006 06:00:46 -0000	1.5
+++ ./graphics/gst-plugins0.8-opengl/Makefile	4 Apr 2006 06:26:53 -0000
@@ -7,7 +7,7 @@
 .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"
Index: ./graphics/gst-plugins0.8-png/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gst-plugins0.8-png/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./graphics/gst-plugins0.8-png/Makefile	21 Mar 2006 06:00:46 -0000	1.5
+++ ./graphics/gst-plugins0.8-png/Makefile	4 Apr 2006 06:26:53 -0000
@@ -8,7 +8,7 @@
 .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"
Index: ./graphics/gthumb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gthumb/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./graphics/gthumb/Makefile	21 Mar 2006 06:00:46 -0000	1.19
+++ ./graphics/gthumb/Makefile	4 Apr 2006 06:26:53 -0000
@@ -16,7 +16,7 @@
 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"
Index: ./graphics/gtkglext/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gtkglext/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./graphics/gtkglext/buildlink3.mk	13 Feb 2006 21:11:13 -0000	1.9
+++ ./graphics/gtkglext/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,7 +11,7 @@
 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
 
Index: ./graphics/hermes/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/hermes/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/hermes/buildlink3.mk	5 Feb 2006 23:09:33 -0000	1.4
+++ ./graphics/hermes/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/hicolor-icon-theme/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/hicolor-icon-theme/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/hicolor-icon-theme/buildlink3.mk	5 Feb 2006 23:09:33 -0000	1.3
+++ ./graphics/hicolor-icon-theme/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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"
Index: ./graphics/imlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./graphics/imlib/buildlink3.mk	5 Feb 2006 23:09:33 -0000	1.8
+++ ./graphics/imlib/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/imlib2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib2/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./graphics/imlib2/buildlink3.mk	5 Feb 2006 23:09:33 -0000	1.11
+++ ./graphics/imlib2/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/inkscape/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/inkscape/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./graphics/inkscape/Makefile	6 Mar 2006 18:50:21 -0000	1.20
+++ ./graphics/inkscape/Makefile	4 Apr 2006 06:26:53 -0000
@@ -23,7 +23,7 @@
 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"
Index: ./graphics/jasper/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/jasper/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/jasper/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.5
+++ ./graphics/jasper/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/jpeg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/jpeg/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/jpeg/buildlink3.mk	3 Oct 2004 00:14:54 -0000	1.6
+++ ./graphics/jpeg/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/kbarcode/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/kbarcode/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./graphics/kbarcode/Makefile	4 Mar 2006 21:29:49 -0000	1.12
+++ ./graphics/kbarcode/Makefile	4 Apr 2006 06:26:53 -0000
@@ -18,7 +18,7 @@
 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"
Index: ./graphics/kdegraphics3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/kdegraphics3/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- ./graphics/kdegraphics3/Makefile	30 Mar 2006 03:02:01 -0000	1.63
+++ ./graphics/kdegraphics3/Makefile	4 Apr 2006 06:26:53 -0000
@@ -9,7 +9,7 @@
 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
 
Index: ./graphics/kdegraphics3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/kdegraphics3/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./graphics/kdegraphics3/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.8
+++ ./graphics/kdegraphics3/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/lcms/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/lcms/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/lcms/buildlink3.mk	3 Oct 2004 00:14:54 -0000	1.6
+++ ./graphics/lcms/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
Index: ./graphics/lib3ds/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/lib3ds/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./graphics/lib3ds/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.2
+++ ./graphics/lib3ds/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libart2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libart2/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/libart2/buildlink3.mk	3 Oct 2004 00:14:55 -0000	1.3
+++ ./graphics/libart2/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libexif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libexif/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./graphics/libexif/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.9
+++ ./graphics/libexif/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libexif-gtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libexif-gtk/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/libexif-gtk/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.4
+++ ./graphics/libexif-gtk/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -13,8 +13,8 @@
 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
 
Index: ./graphics/libgdgeda/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgdgeda/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/libgdgeda/buildlink3.mk	3 Oct 2004 00:14:55 -0000	1.4
+++ ./graphics/libgdgeda/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libgdiplus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgdiplus/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ./graphics/libgdiplus/Makefile	5 Feb 2006 23:09:34 -0000	1.25
+++ ./graphics/libgdiplus/Makefile	4 Apr 2006 06:26:53 -0000
@@ -17,9 +17,9 @@
 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
 
Index: ./graphics/libgdiplus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgdiplus/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./graphics/libgdiplus/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.16
+++ ./graphics/libgdiplus/buildlink3.mk	4 Apr 2006 06:26:53 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libggi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libggi/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/libggi/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.6
+++ ./graphics/libggi/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libggiwmh/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libggiwmh/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./graphics/libggiwmh/buildlink3.mk	5 Feb 2006 23:09:34 -0000	1.2
+++ ./graphics/libggiwmh/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libgii/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgii/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/libgii/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.5
+++ ./graphics/libgii/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libgnomecanvas/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgnomecanvas/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./graphics/libgnomecanvas/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.8
+++ ./graphics/libgnomecanvas/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libgnomecanvasmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libgnomecanvasmm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/libgnomecanvasmm/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.3
+++ ./graphics/libgnomecanvasmm/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libkipi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libkipi/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/libkipi/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.3
+++ ./graphics/libkipi/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
Index: ./graphics/libkexif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libkexif/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/libkexif/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.3
+++ ./graphics/libkexif/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libpixman/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libpixman/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/libpixman/buildlink3.mk	27 Mar 2005 12:28:08 -0000	1.6
+++ ./graphics/libpixman/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 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
 
Index: ./graphics/librsvg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/librsvg/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/librsvg/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.3
+++ ./graphics/librsvg/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/librsvg2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/librsvg2/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- ./graphics/librsvg2/Makefile	21 Mar 2006 06:00:46 -0000	1.46
+++ ./graphics/librsvg2/Makefile	4 Apr 2006 06:26:54 -0000
@@ -34,7 +34,7 @@
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/gtk-doc/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"
Index: ./graphics/librsvg2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/librsvg2/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./graphics/librsvg2/buildlink3.mk	6 Mar 2006 00:18:13 -0000	1.15
+++ ./graphics/librsvg2/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libungif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libungif/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/libungif/buildlink3.mk	3 Oct 2004 00:14:55 -0000	1.6
+++ ./graphics/libungif/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libvideogfx/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libvideogfx/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./graphics/libvideogfx/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.3
+++ ./graphics/libvideogfx/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/libwmf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libwmf/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./graphics/libwmf/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.8
+++ ./graphics/libwmf/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/mng/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/mng/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/mng/buildlink3.mk	5 Feb 2006 23:09:35 -0000	1.6
+++ ./graphics/mng/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/netpbm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/netpbm/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./graphics/netpbm/buildlink3.mk	5 Feb 2006 23:09:36 -0000	1.7
+++ ./graphics/netpbm/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/openexr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/openexr/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./graphics/openexr/buildlink3.mk	5 Feb 2006 23:09:36 -0000	1.2
+++ ./graphics/openexr/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/optipng/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/optipng/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./graphics/optipng/Makefile	19 Jan 2006 11:18:41 -0000	1.5
+++ ./graphics/optipng/Makefile	4 Apr 2006 06:26:54 -0000
@@ -8,7 +8,7 @@
 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"
Index: ./graphics/p5-GD/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/p5-GD/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./graphics/p5-GD/Makefile	5 Feb 2006 23:09:36 -0000	1.33
+++ ./graphics/p5-GD/Makefile	4 Apr 2006 06:26:54 -0000
@@ -13,7 +13,7 @@
 
 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
Index: ./graphics/p5-Image-Imlib2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/p5-Image-Imlib2/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./graphics/p5-Image-Imlib2/Makefile	4 Mar 2006 21:29:50 -0000	1.18
+++ ./graphics/p5-Image-Imlib2/Makefile	4 Apr 2006 06:26:54 -0000
@@ -13,7 +13,7 @@
 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
 
Index: ./graphics/p5-PerlMagick/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- ./graphics/p5-PerlMagick/Makefile	4 Mar 2006 21:29:50 -0000	1.49
+++ ./graphics/p5-PerlMagick/Makefile	4 Apr 2006 06:26:54 -0000
@@ -32,7 +32,7 @@
 
 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"
Index: ./graphics/plotutils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/plotutils/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/plotutils/buildlink3.mk	5 Feb 2006 23:09:37 -0000	1.5
+++ ./graphics/plotutils/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/plotutils-nox11/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/plotutils-nox11/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./graphics/plotutils-nox11/buildlink3.mk	17 Apr 2004 01:14:19 -0000	1.1
+++ ./graphics/plotutils-nox11/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 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
 
Index: ./graphics/png/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/png/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./graphics/png/buildlink3.mk	3 Oct 2004 00:14:57 -0000	1.11
+++ ./graphics/png/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/povray/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/povray/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./graphics/povray/Makefile	5 Feb 2006 23:09:38 -0000	1.33
+++ ./graphics/povray/Makefile	4 Apr 2006 06:26:54 -0000
@@ -13,7 +13,7 @@
 
 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
Index: ./graphics/py-imaging/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imaging/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./graphics/py-imaging/buildlink3.mk	5 Feb 2006 23:09:38 -0000	1.5
+++ ./graphics/py-imaging/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -13,8 +13,8 @@
 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
 
Index: ./graphics/py-imagingtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-imagingtk/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./graphics/py-imagingtk/Makefile	4 Mar 2006 21:29:51 -0000	1.19
+++ ./graphics/py-imagingtk/Makefile	4 Apr 2006 06:26:54 -0000
@@ -13,7 +13,7 @@
 
 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}
Index: ./graphics/ruby-imlib2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/ruby-imlib2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./graphics/ruby-imlib2/Makefile	5 Feb 2006 23:09:39 -0000	1.8
+++ ./graphics/ruby-imlib2/Makefile	4 Apr 2006 06:26:54 -0000
@@ -20,7 +20,7 @@
 
 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"
Index: ./graphics/sane-backends/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/sane-backends/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/sane-backends/buildlink3.mk	5 Feb 2006 23:09:39 -0000	1.4
+++ ./graphics/sane-backends/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/sane-frontends/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/sane-frontends/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ./graphics/sane-frontends/Makefile	6 Mar 2006 00:18:17 -0000	1.25
+++ ./graphics/sane-frontends/Makefile	4 Apr 2006 06:26:54 -0000
@@ -8,7 +8,7 @@
 
 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
 
Index: ./graphics/simage/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/simage/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./graphics/simage/buildlink3.mk	5 Feb 2006 23:09:39 -0000	1.4
+++ ./graphics/simage/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/tiff/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/tiff/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./graphics/tiff/buildlink3.mk	12 May 2005 12:53:21 -0000	1.12
+++ ./graphics/tiff/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/tuxpaint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/tuxpaint/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- ./graphics/tuxpaint/Makefile	7 Mar 2006 18:56:46 -0000	1.38
+++ ./graphics/tuxpaint/Makefile	4 Apr 2006 06:26:54 -0000
@@ -15,9 +15,9 @@
 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
 
Index: ./graphics/urt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/urt/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./graphics/urt/buildlink3.mk	5 Feb 2006 23:09:40 -0000	1.2
+++ ./graphics/urt/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/wxsvg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/wxsvg/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./graphics/wxsvg/buildlink3.mk	5 Feb 2006 23:09:40 -0000	1.2
+++ ./graphics/wxsvg/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/xfce4-artwork/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xfce4-artwork/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/xfce4-artwork/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.6
+++ ./graphics/xfce4-artwork/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/xfce4-icon-theme/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xfce4-icon-theme/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./graphics/xfce4-icon-theme/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.6
+++ ./graphics/xfce4-icon-theme/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/xfce4-iconbox/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xfce4-iconbox/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./graphics/xfce4-iconbox/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.11
+++ ./graphics/xfce4-iconbox/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/xfig/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xfig/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- ./graphics/xfig/Makefile	5 Feb 2006 23:09:41 -0000	1.45
+++ ./graphics/xfig/Makefile	4 Apr 2006 06:26:54 -0000
@@ -13,7 +13,7 @@
 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
Index: ./graphics/xpm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xpm/buildlink3.mk,v
retrieving revision 1.19
diff -u -r1.19 buildlink3.mk
--- ./graphics/xpm/buildlink3.mk	5 Feb 2006 23:09:41 -0000	1.19
+++ ./graphics/xpm/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 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
 
Index: ./graphics/xpm/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/xpm/builtin.mk,v
retrieving revision 1.10
diff -u -r1.10 builtin.mk
--- ./graphics/xpm/builtin.mk	3 Jun 2005 19:12:49 -0000	1.10
+++ ./graphics/xpm/builtin.mk	4 Apr 2006 06:26:54 -0000
@@ -63,7 +63,7 @@
 .    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	\
Index: ./ham/gnuradio-core/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/ham/gnuradio-core/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./ham/gnuradio-core/buildlink3.mk	5 Feb 2006 23:09:41 -0000	1.5
+++ ./ham/gnuradio-core/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnuradio-core
 
 .if !empty(GNURADIO_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnuradio-core+=	gnuradio-core>=2.6
-BUILDLINK_RECOMMENDED.gnuradio-core?=	gnuradio-core>=2.6nb3
+BUILDLINK_API_DEPENDS.gnuradio-core+=	gnuradio-core>=2.6
+BUILDLINK_ABI_DEPENDS.gnuradio-core?=	gnuradio-core>=2.6nb3
 BUILDLINK_PKGSRCDIR.gnuradio-core?=	../../ham/gnuradio-core
 .endif	# GNURADIO_CORE_BUILDLINK3_MK
 
Index: ./ham/gnuradio-wxgui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/ham/gnuradio-wxgui/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./ham/gnuradio-wxgui/buildlink3.mk	5 Feb 2006 23:09:42 -0000	1.3
+++ ./ham/gnuradio-wxgui/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnuradio-wxgui
 
 .if !empty(GNURADIO_WXGUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=0.3
-BUILDLINK_RECOMMENDED.gnuradio-wxgui?=	gnuradio-wxgui>=0.4nb2
+BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=0.3
+BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?=	gnuradio-wxgui>=0.4nb2
 BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../ham/gnuradio-wxgui
 .endif	# GNURADIO_WXGUI_BUILDLINK3_MK
 
Index: ./ham/hamlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/ham/hamlib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./ham/hamlib/buildlink3.mk	28 Feb 2006 00:10:04 -0000	1.4
+++ ./ham/hamlib/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	hamlib
 
 .if !empty(HAMLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hamlib+=	hamlib>=1.1.4
-BUILDLINK_RECOMMENDED.hamlib+=	hamlib>=1.2.5
+BUILDLINK_API_DEPENDS.hamlib+=	hamlib>=1.1.4
+BUILDLINK_ABI_DEPENDS.hamlib+=	hamlib>=1.2.5
 BUILDLINK_PKGSRCDIR.hamlib?=	../../ham/hamlib
 .endif	# HAMLIB_BUILDLINK3_MK
 
Index: ./ham/usrp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/ham/usrp/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./ham/usrp/buildlink3.mk	5 Feb 2006 23:09:42 -0000	1.4
+++ ./ham/usrp/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	usrp
 
 .if !empty(USRP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.usrp+=	usrp>=0.9
-BUILDLINK_RECOMMENDED.usrp?=	usrp>=0.9nb2
+BUILDLINK_API_DEPENDS.usrp+=	usrp>=0.9
+BUILDLINK_ABI_DEPENDS.usrp?=	usrp>=0.9nb2
 BUILDLINK_PKGSRCDIR.usrp?=	../../ham/usrp
 .endif	# USRP_BUILDLINK3_MK
 
Index: ./inputmethod/anthy/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/anthy/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./inputmethod/anthy/buildlink3.mk	5 Feb 2006 23:09:42 -0000	1.2
+++ ./inputmethod/anthy/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	anthy
 
 .if !empty(ANTHY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.anthy+=	anthy>=6300
-BUILDLINK_RECOMMENDED.anthy?=	anthy>=7100bnb1
+BUILDLINK_API_DEPENDS.anthy+=	anthy>=6300
+BUILDLINK_ABI_DEPENDS.anthy?=	anthy>=7100bnb1
 BUILDLINK_PKGSRCDIR.anthy?=	../../inputmethod/anthy
 .endif  # ANTHY_BUILDLINK3_MK
 
Index: ./inputmethod/canna-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/canna-lib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./inputmethod/canna-lib/buildlink3.mk	5 Mar 2004 21:08:52 -0000	1.2
+++ ./inputmethod/canna-lib/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	Canna-lib
 
 .if !empty(CANNA_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Canna-lib+=	Canna-lib>=3.6pl4
+BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.6pl4
 BUILDLINK_PKGSRCDIR.Canna-lib?=	../../inputmethod/canna-lib
 
 .endif	# CANNA_LIB_BUILDLINK3_MK
Index: ./inputmethod/ja-freewnn-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/ja-freewnn-lib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./inputmethod/ja-freewnn-lib/buildlink3.mk	5 May 2005 19:37:22 -0000	1.2
+++ ./inputmethod/ja-freewnn-lib/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	ja-FreeWnn-lib
 
 .if !empty(JA_FREEWNN_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ja-FreeWnn-lib+=	ja-FreeWnn-lib>=1.10nb3
+BUILDLINK_API_DEPENDS.ja-FreeWnn-lib+=	ja-FreeWnn-lib>=1.10nb3
 BUILDLINK_PKGSRCDIR.ja-FreeWnn-lib?=	../../inputmethod/ja-freewnn-lib
 BUILDLINK_DEPMETHOD.ja-freewnn?=	build
 .endif	# JA_FREEWNN_LIB_BUILDLINK3_MK
Index: ./inputmethod/libchewing/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/libchewing/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./inputmethod/libchewing/buildlink3.mk	28 Jan 2006 02:42:06 -0000	1.1.1.1
+++ ./inputmethod/libchewing/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libchewing
 
 .if !empty(LIBCHEWING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libchewing+=		libchewing>=0.2.7
-BUILDLINK_RECOMMENDED.libchewing+=	libchewing>=0.2.7
+BUILDLINK_API_DEPENDS.libchewing+=		libchewing>=0.2.7
+BUILDLINK_ABI_DEPENDS.libchewing+=	libchewing>=0.2.7
 BUILDLINK_PKGSRCDIR.libchewing?=	../../inputmethod/libchewing
 .endif	# LIBCHEWING_BUILDLINK3_MK
 
Index: ./inputmethod/libtabe/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/libtabe/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./inputmethod/libtabe/buildlink3.mk	5 Feb 2006 23:09:43 -0000	1.3
+++ ./inputmethod/libtabe/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtabe
 
 .if !empty(LIBTABE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtabe+=	libtabe>=0.2.5
-BUILDLINK_RECOMMENDED.libtabe+=	libtabe>=0.2.5nb2
+BUILDLINK_API_DEPENDS.libtabe+=	libtabe>=0.2.5
+BUILDLINK_ABI_DEPENDS.libtabe+=	libtabe>=0.2.5nb2
 BUILDLINK_PKGSRCDIR.libtabe?=	../../inputmethod/libtabe
 .endif	# LIBTABE_BUILDLINK3_MK
 
Index: ./inputmethod/sj3-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/sj3-lib/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./inputmethod/sj3-lib/buildlink3.mk	30 Nov 2004 02:30:59 -0000	1.3
+++ ./inputmethod/sj3-lib/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	sj3-lib
 
 .if !empty(SJ3_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sj3-lib+=	sj3-lib>=2.0.1.20nb1
+BUILDLINK_API_DEPENDS.sj3-lib+=	sj3-lib>=2.0.1.20nb1
 BUILDLINK_PKGSRCDIR.sj3-lib?=	../../inputmethod/sj3-lib
 .endif	# SJ3_LIB_BUILDLINK3_MK
 
Index: ./inputmethod/uim/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/uim/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./inputmethod/uim/buildlink3.mk	5 Feb 2006 23:09:43 -0000	1.3
+++ ./inputmethod/uim/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	uim
 
 .if !empty(UIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.uim+=		uim>=0.4.6
-BUILDLINK_RECOMMENDED.uim?=	uim>=1.0.1nb2
+BUILDLINK_API_DEPENDS.uim+=		uim>=0.4.6
+BUILDLINK_ABI_DEPENDS.uim?=	uim>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.uim?=	../../inputmethod/uim
 .endif  # UIM_BUILDLINK3_MK
 
Index: ./inputmethod/unicon-im/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/inputmethod/unicon-im/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./inputmethod/unicon-im/buildlink3.mk	5 Feb 2006 23:09:43 -0000	1.3
+++ ./inputmethod/unicon-im/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	unicon-im
 
 .if !empty(UNICON_IM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.unicon-im+=	unicon-im>=1.2nb2
-BUILDLINK_RECOMMENDED.unicon-im+=	unicon-im>=1.2nb4
+BUILDLINK_API_DEPENDS.unicon-im+=	unicon-im>=1.2nb2
+BUILDLINK_ABI_DEPENDS.unicon-im+=	unicon-im>=1.2nb4
 BUILDLINK_PKGSRCDIR.unicon-im?=	../../inputmethod/unicon-im
 .endif	# UNICON_IM_BUILDLINK3_MK
 
Index: ./lang/Cg-compiler/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/Cg-compiler/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/Cg-compiler/buildlink3.mk	5 Feb 2006 23:09:43 -0000	1.2
+++ ./lang/Cg-compiler/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Cg-compiler
 
 .if !empty(CG_COMPILER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Cg-compiler+=		Cg-compiler>=1.2.1
-BUILDLINK_RECOMMENDED.Cg-compiler?=	Cg-compiler>=1.3beta2nb1
+BUILDLINK_API_DEPENDS.Cg-compiler+=		Cg-compiler>=1.2.1
+BUILDLINK_ABI_DEPENDS.Cg-compiler?=	Cg-compiler>=1.3beta2nb1
 BUILDLINK_PKGSRCDIR.Cg-compiler?=	../../lang/Cg-compiler
 .endif	# CG_COMPILER_BUILDLINK3_MK
 
Index: ./lang/blackdown-jdk13/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/blackdown-jdk13/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/blackdown-jdk13/buildlink3.mk	2 Jul 2004 12:51:57 -0000	1.2
+++ ./lang/blackdown-jdk13/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(BLACKDOWN_JDK13_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.blackdown-jdk13+=	blackdown-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jdk13+=	blackdown-jdk13-[0-9]*
 BUILDLINK_PKGSRCDIR.blackdown-jdk13?=	../../lang/blackdown-jdk13
 BUILDLINK_DEPMETHOD.blackdown-jdk13?=   build
 
Index: ./lang/blackdown-jre13/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/blackdown-jre13/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./lang/blackdown-jre13/buildlink3.mk	5 May 2004 18:12:11 -0000	1.1
+++ ./lang/blackdown-jre13/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(BLACKDOWN_JRE13_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.blackdown-jre13+=	blackdown-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jre13+=	blackdown-jre13-[0-9]*
 BUILDLINK_PKGSRCDIR.blackdown-jre13?=	../../lang/blackdown-jre13
 EVAL_PREFIX+=   BUILDLINK_JAVA_PREFIX.blackdown-jre13=blackdown-jre13
 BUILDLINK_JAVA_PREFIX.blackdown-jre13=	\
Index: ./lang/cdl3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/cdl3/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/cdl3/buildlink3.mk	5 Feb 2006 23:09:43 -0000	1.2
+++ ./lang/cdl3/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cdl3
 
 .if !empty(CDL3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cdl3+=	cdl3>=1.2.5
-BUILDLINK_RECOMMENDED.cdl3?=	cdl3>=1.2.5nb1
+BUILDLINK_API_DEPENDS.cdl3+=	cdl3>=1.2.5
+BUILDLINK_ABI_DEPENDS.cdl3?=	cdl3>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.cdl3?=	../../lang/cdl3
 .endif	# CDL3_BUILDLINK3_MK
 
Index: ./lang/clisp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/clisp/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- ./lang/clisp/Makefile	16 Mar 2006 22:17:04 -0000	1.51
+++ ./lang/clisp/Makefile	4 Apr 2006 06:26:54 -0000
@@ -50,7 +50,7 @@
 .include "../../devel/libsigsegv/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-BUILDLINK_DEPENDS.zlib+=	zlib>=1.2
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2
 .include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: ./lang/coq/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/coq/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./lang/coq/Makefile	5 Feb 2006 23:09:44 -0000	1.13
+++ ./lang/coq/Makefile	4 Apr 2006 06:26:54 -0000
@@ -17,7 +17,7 @@
 CONFIGURE_ARGS+=	-reals all
 BUILD_TARGET=		world
 
-BUILDLINK_DEPENDS.ocaml+=       ocaml>=3.09
+BUILDLINK_API_DEPENDS.ocaml+=       ocaml>=3.09
 
 .include "../../mk/bsd.prefs.mk"
 
Index: ./lang/elk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/elk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/elk/buildlink3.mk	15 Oct 2005 23:07:21 -0000	1.2
+++ ./lang/elk/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	elk
 
 .if !empty(ELK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.elk+=	elk>=3.99.6
+BUILDLINK_API_DEPENDS.elk+=	elk>=3.99.6
 BUILDLINK_PKGSRCDIR.elk?=	../../lang/elk
 .endif	# ELK_BUILDLINK3_MK
 
Index: ./lang/erlang/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/erlang/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/erlang/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.3
+++ ./lang/erlang/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=		erlang
 
 .if !empty(ERLANG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.erlang+=	erlang>=10.1
-BUILDLINK_RECOMMENDED.erlang?=	erlang>=10.1.9nb1
+BUILDLINK_API_DEPENDS.erlang+=	erlang>=10.1
+BUILDLINK_ABI_DEPENDS.erlang?=	erlang>=10.1.9nb1
 BUILDLINK_PKGSRCDIR.erlang?=	../../lang/erlang
 .endif	# ERLANG_BUILDLINK3_MK
 
Index: ./lang/ezm3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ezm3/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/ezm3/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.2
+++ ./lang/ezm3/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	ezm3
 
 .if !empty(EZM3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ezm3+=	ezm3>=1.1nb1
+BUILDLINK_API_DEPENDS.ezm3+=	ezm3>=1.1nb1
 BUILDLINK_DEPMETHOD.ezm3?=	build
-BUILDLINK_RECOMMENDED.ezm3?=	ezm3>=1.2nb1
+BUILDLINK_ABI_DEPENDS.ezm3?=	ezm3>=1.2nb1
 BUILDLINK_PKGSRCDIR.ezm3?=	../../lang/ezm3
 .endif	# EZM3_BUILDLINK3_MK
 
Index: ./lang/f2c/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/f2c/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/f2c/buildlink3.mk	5 Dec 2005 20:50:25 -0000	1.5
+++ ./lang/f2c/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	f2c
 
 .if !empty(F2C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.f2c+=		f2c>=20001205nb3
-BUILDLINK_RECOMMENDED.f2c+=	f2c>=20001205nb8
+BUILDLINK_API_DEPENDS.f2c+=		f2c>=20001205nb3
+BUILDLINK_ABI_DEPENDS.f2c+=	f2c>=20001205nb8
 BUILDLINK_PKGSRCDIR.f2c?=	../../lang/f2c
 .endif	# F2C_BUILDLINK3_MK
 
Index: ./lang/gauche/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gauche/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/gauche/buildlink3.mk	9 Dec 2005 15:38:54 -0000	1.4
+++ ./lang/gauche/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	Gauche
 
 .if !empty(GAUCHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Gauche+=	Gauche>=0.8.1
+BUILDLINK_API_DEPENDS.Gauche+=	Gauche>=0.8.1
 BUILDLINK_PKGSRCDIR.Gauche?=	../../lang/gauche
 .endif	# GAUCHE_BUILDLINK3_MK
 
Index: ./lang/gawk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gawk/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./lang/gawk/Makefile	30 Mar 2006 03:44:43 -0000	1.34
+++ ./lang/gawk/Makefile	4 Apr 2006 06:26:54 -0000
@@ -35,7 +35,7 @@
 CONFIGURE_ARGS+=	--enable-portals
 .endif
 
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.10.36
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.10.36
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./lang/gcc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./lang/gcc/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.9
+++ ./lang/gcc/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	gcc
 
 .if !empty(GCC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc?=	gcc>=2.95.3nb7
+BUILDLINK_API_DEPENDS.gcc+=		gcc>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc?=	gcc>=2.95.3nb7
 BUILDLINK_PKGSRCDIR.gcc?=	../../lang/gcc
 BUILDLINK_LIBDIRS.gcc?=		\
 	${_GCC_PREFIX:S/^${BUILDLINK_PREFIX.gcc}\///}lib \
Index: ./lang/gcc3/language.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3/language.mk,v
retrieving revision 1.4
diff -u -r1.4 language.mk
--- ./lang/gcc3/language.mk	22 Sep 2004 08:09:39 -0000	1.4
+++ ./lang/gcc3/language.mk	4 Apr 2006 06:26:54 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: language.mk,v 1.4 2004/09/22 08:09:39 jlam Exp $
 
-BUILDLINK_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}{,nb*}
+BUILDLINK_API_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}{,nb*}
 BUILDLINK_DEPMETHOD.gcc3-c+=	full
 
 .include "../../lang/gcc3/Makefile.common"
Index: ./lang/gcc3-ada/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-ada/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/gcc3-ada/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.3
+++ ./lang/gcc3-ada/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=    gcc3-ada
 
 .if !empty(GCC3_ADA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc3-ada+=      gcc3-ada>=3.3.3
-BUILDLINK_RECOMMENDED.gcc3-ada?=    gcc3-ada>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-ada+=      gcc3-ada>=3.3.3
+BUILDLINK_ABI_DEPENDS.gcc3-ada?=    gcc3-ada>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-ada?=    ../../lang/gcc3-ada
 BUILDLINK_ENV+= ADAC=${LOCALBASE}/gcc3/bin/gcc
 _GCC_ARCHDIR!=	${DIRNAME} `${LOCALBASE}/gcc3/bin/gcc --print-libgcc-file-name`
Index: ./lang/gcc3-c/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./lang/gcc3-c/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.12
+++ ./lang/gcc3-c/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -22,8 +22,8 @@
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-c?=	gcc3-c>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-c+=	gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-c?=	gcc3-c>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-c?=	../../lang/gcc3-c
 BUILDLINK_GCC3_LIBDIRS=		lib
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
Index: ./lang/gcc3-c++/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c++/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./lang/gcc3-c++/buildlink3.mk	5 Feb 2006 23:09:44 -0000	1.12
+++ ./lang/gcc3-c++/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -18,8 +18,8 @@
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_DEPENDS.gcc3-cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-cxx?=	gcc3-c++>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-cxx+=	gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-cxx?=	gcc3-c++>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-cxx?=	../../lang/gcc3-c++
 BUILDLINK_LIBDIRS.gcc3-cxx?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
Index: ./lang/gcc3-f77/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-f77/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./lang/gcc3-f77/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.12
+++ ./lang/gcc3-f77/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -18,8 +18,8 @@
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_DEPENDS.gcc3-f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-f77?=	gcc3-f77>=3.3.5nb2
+BUILDLINK_API_DEPENDS.gcc3-f77+=	gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-f77?=	gcc3-f77>=3.3.5nb2
 BUILDLINK_PKGSRCDIR.gcc3-f77?=	../../lang/gcc3-f77
 BUILDLINK_LIBDIRS.gcc3-f77?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///}
Index: ./lang/gcc34/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc34/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./lang/gcc34/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.10
+++ ./lang/gcc34/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=    gcc34
 
 .if !empty(GCC34_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc34+=	gcc34>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc34?=	gcc34>=3.4.5nb1
+BUILDLINK_API_DEPENDS.gcc34+=	gcc34>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc34?=	gcc34>=3.4.5nb1
 BUILDLINK_PKGSRCDIR.gcc34?=	../../lang/gcc34
 .  if exists(${BUILDLINK_PREFIX.gcc34}/bin/gcc)
 _GNAT1!=${BUILDLINK_PREFIX.gcc34}/bin/gcc -print-prog-name=gnat1
Index: ./lang/gcc3-java/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-java/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./lang/gcc3-java/Makefile	5 Feb 2006 23:09:45 -0000	1.19
+++ ./lang/gcc3-java/Makefile	4 Apr 2006 06:26:54 -0000
@@ -4,7 +4,7 @@
 PKGREVISION=	1
 COMMENT=	GNU Compiler Collection, v3 - Java compiler
 
-BUILDLINK_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}{,nb*}
+BUILDLINK_API_DEPENDS.gcc3cxx+=	gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}{,nb*}
 BUILDLINK_DEPMETHOD.gcc3cxx+=	full
 
 INFO_FILES=	gcj.info
Index: ./lang/gcc3-java/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-java/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./lang/gcc3-java/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.12
+++ ./lang/gcc3-java/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -18,8 +18,8 @@
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_DEPENDS.gcc3-java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-java?=	gcc3-java>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-java+=	gcc3${GCC3_PKGMODIF}-java>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-java?=	gcc3-java>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-java?=	../../lang/gcc3-java
 BUILDLINK_LIBDIRS.gcc3-java?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-java}\///}
Index: ./lang/gcc3-objc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-objc/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./lang/gcc3-objc/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.12
+++ ./lang/gcc3-objc/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -18,8 +18,8 @@
 GCC3_PKGMODIF=	_${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_DEPENDS.gcc3-objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
-BUILDLINK_RECOMMENDED.gcc3-objc?=	gcc3-objc>=3.3.5nb1
+BUILDLINK_API_DEPENDS.gcc3-objc+=	gcc3${GCC3_PKGMODIF}-objc>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc3-objc?=	gcc3-objc>=3.3.5nb1
 BUILDLINK_PKGSRCDIR.gcc3-objc?=	../../lang/gcc3-objc
 BUILDLINK_LIBDIRS.gcc3-objc?=	\
 	lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///}
Index: ./lang/gcc34-ada/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc34-ada/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./lang/gcc34-ada/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.7
+++ ./lang/gcc34-ada/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	gcc34-ada
 
 .if !empty(GCCADA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gcc34-ada+=	gcc34-ada>=3.4.1nb4
-BUILDLINK_RECOMMENDED.gcc34-ada?=	gcc34-ada>=3.4.4nb1
+BUILDLINK_API_DEPENDS.gcc34-ada+=	gcc34-ada>=3.4.1nb4
+BUILDLINK_ABI_DEPENDS.gcc34-ada?=	gcc34-ada>=3.4.4nb1
 BUILDLINK_PKGSRCDIR.gcc34-ada?=	../../lang/gcc34-ada
 BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc
 .  if exists(${BUILDLINK_PREFIX.gcc34-ada}/bin/gcc)
Index: ./lang/ghc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ghc/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/ghc/buildlink3.mk	22 Mar 2006 15:12:07 -0000	1.3
+++ ./lang/ghc/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ghc
 
 .if !empty(GHC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ghc+=		ghc>=6.2.1nb1
-BUILDLINK_RECOMMENDED.ghc?=	ghc>=6.4.1nb1
+BUILDLINK_API_DEPENDS.ghc+=		ghc>=6.2.1nb1
+BUILDLINK_ABI_DEPENDS.ghc?=	ghc>=6.4.1nb1
 BUILDLINK_PKGSRCDIR.ghc?=	../../lang/ghc
 
 BUILDLINK_DEPMETHOD.ghc?=	build
Index: ./lang/guile/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/guile/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./lang/guile/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.7
+++ ./lang/guile/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	guile
 
 .if !empty(GUILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile+=	guile>=1.6.3nb1
-BUILDLINK_RECOMMENDED.guile+=	guile>=1.6.7nb3
+BUILDLINK_API_DEPENDS.guile+=	guile>=1.6.3nb1
+BUILDLINK_ABI_DEPENDS.guile+=	guile>=1.6.7nb3
 BUILDLINK_PKGSRCDIR.guile?=	../../lang/guile
 .endif	# GUILE_BUILDLINK3_MK
 
Index: ./lang/guile14/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/guile14/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/guile14/buildlink3.mk	5 Feb 2006 23:09:45 -0000	1.5
+++ ./lang/guile14/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	guile14
 
 .if !empty(GUILE14_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guile14+=	guile14>=1.4.1nb4
-BUILDLINK_RECOMMENDED.guile14+=	guile14>=1.4.1nb8
+BUILDLINK_API_DEPENDS.guile14+=	guile14>=1.4.1nb4
+BUILDLINK_ABI_DEPENDS.guile14+=	guile14>=1.4.1nb8
 BUILDLINK_PKGSRCDIR.guile14?=	../../lang/guile14
 
 BUILDLINK_PASSTHRU_DIRS=	${LOCALBASE}/guile/1.4
Index: ./lang/jdk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/jdk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/jdk/buildlink3.mk	2 Jul 2004 12:51:57 -0000	1.2
+++ ./lang/jdk/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	jdk
 
 .if !empty(JDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jdk+=	jdk>=1.1.8
+BUILDLINK_API_DEPENDS.jdk+=	jdk>=1.1.8
 BUILDLINK_PKGSRCDIR.jdk?=	../../lang/jdk
 BUILDLINK_JAVA_PREFIX.jdk=	${PREFIX}/java/jdk-1.1.8
 
Index: ./lang/kaffe/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/kaffe/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./lang/kaffe/buildlink3.mk	5 Feb 2006 23:09:46 -0000	1.10
+++ ./lang/kaffe/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kaffe
 
 .if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kaffe+=	kaffe>=1.1.6
-BUILDLINK_RECOMMENDED.kaffe?=	kaffe>=1.1.6nb2
+BUILDLINK_API_DEPENDS.kaffe+=	kaffe>=1.1.6
+BUILDLINK_ABI_DEPENDS.kaffe?=	kaffe>=1.1.6nb2
 BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
 BUILDLINK_JAVA_PREFIX.kaffe=	${PREFIX}/java/kaffe
 .endif	# KAFFE_BUILDLINK3_MK
Index: ./lang/librep/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/librep/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./lang/librep/buildlink3.mk	5 Feb 2006 23:09:46 -0000	1.8
+++ ./lang/librep/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	librep
 
 .if !empty(LIBREP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.librep+=	librep>=0.17
-BUILDLINK_RECOMMENDED.librep+=	librep>=0.17nb2
+BUILDLINK_API_DEPENDS.librep+=	librep>=0.17
+BUILDLINK_ABI_DEPENDS.librep+=	librep>=0.17nb2
 BUILDLINK_PKGSRCDIR.librep?=	../../lang/librep
 MAKE_FLAGS+=			rep_LIBTOOL=${LIBTOOL:Q}
 .endif	# LIBREP_BUILDLINK3_MK
Index: ./lang/libtcl-nothread/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/libtcl-nothread/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/libtcl-nothread/buildlink3.mk	3 Oct 2004 00:15:01 -0000	1.2
+++ ./lang/libtcl-nothread/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tclnt
 
 .if !empty(TCLNT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6
-BUILDLINK_RECOMMENDED.tclnt+=	libtcl-nothread>=8.4.6nb1
+BUILDLINK_API_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6
+BUILDLINK_ABI_DEPENDS.tclnt+=	libtcl-nothread>=8.4.6nb1
 BUILDLINK_PKGSRCDIR.tclnt?=	../../lang/libtcl-nothread
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
Index: ./lang/lua/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/lua/buildlink3.mk	4 Sep 2005 04:59:36 -0000	1.4
+++ ./lang/lua/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lua
 
 .if !empty(LUA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lua+=		lua>=5.0.2
-BUILDLINK_RECOMMENDED.lua+=	lua>=5.0.2nb4
+BUILDLINK_API_DEPENDS.lua+=		lua>=5.0.2
+BUILDLINK_ABI_DEPENDS.lua+=	lua>=5.0.2nb4
 BUILDLINK_PKGSRCDIR.lua?=	../../lang/lua
 .endif	# LUA_BUILDLINK3_MK
 
Index: ./lang/lua4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/lua4/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./lang/lua4/buildlink3.mk	28 Apr 2004 00:28:18 -0000	1.1
+++ ./lang/lua4/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	lua4
 
 .if !empty(LUA4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lua4+=	lua4>=4.0.1
+BUILDLINK_API_DEPENDS.lua4+=	lua4>=4.0.1
 BUILDLINK_PKGSRCDIR.lua4?=	../../lang/lua4
 .endif	# LUA4_BUILDLINK3_MK
 
Index: ./lang/mono/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/mono/buildlink3.mk,v
retrieving revision 1.19
diff -u -r1.19 buildlink3.mk
--- ./lang/mono/buildlink3.mk	5 Feb 2006 23:09:46 -0000	1.19
+++ ./lang/mono/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mono
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mono+=	mono>=1.1.12.1
-BUILDLINK_RECOMMENDED.mono?=	mono>=1.1.12.1nb2
+BUILDLINK_API_DEPENDS.mono+=	mono>=1.1.12.1
+BUILDLINK_ABI_DEPENDS.mono?=	mono>=1.1.12.1nb2
 BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 .endif	# MONO_BUILDLINK3_MK
 
Index: ./lang/ocaml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./lang/ocaml/buildlink3.mk	5 Feb 2006 23:09:46 -0000	1.15
+++ ./lang/ocaml/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_DEPMETHOD.ocaml?=	build
 
 .if !empty(OCAML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
-BUILDLINK_RECOMMENDED.ocaml?=	ocaml>=3.09.1nb2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
+BUILDLINK_ABI_DEPENDS.ocaml?=	ocaml>=3.09.1nb2
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 
 . include "../../mk/bsd.prefs.mk"
Index: ./lang/onyx/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/onyx/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./lang/onyx/Makefile	4 Mar 2006 21:29:55 -0000	1.18
+++ ./lang/onyx/Makefile	4 Apr 2006 06:26:54 -0000
@@ -18,7 +18,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre}
 
-BUILDLINK_DEPENDS.pcre?=        pcre>=4.0
+BUILDLINK_API_DEPENDS.pcre?=        pcre>=4.0
 
 VERS=		5.1.1
 PLIST_SUBST+=	VERS=${VERS:Q}
Index: ./lang/parrot/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/parrot/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/parrot/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.2
+++ ./lang/parrot/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	parrot
 
 .if !empty(PARROT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.parrot+=		parrot>=0.4.0
-BUILDLINK_RECOMMENDED.parrot?=		parrot>=0.4.1nb1
+BUILDLINK_API_DEPENDS.parrot+=		parrot>=0.4.0
+BUILDLINK_ABI_DEPENDS.parrot?=		parrot>=0.4.1nb1
 BUILDLINK_PKGSRCDIR.parrot?=		../../lang/parrot
 .endif	# PARROT_BUILDLINK3_MK
 
Index: ./lang/perl5/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/perl5/buildlink3.mk,v
retrieving revision 1.30
diff -u -r1.30 buildlink3.mk
--- ./lang/perl5/buildlink3.mk	14 Mar 2006 01:14:29 -0000	1.30
+++ ./lang/perl5/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -16,7 +16,7 @@
 USE_TOOLS+=			perl
 PERL5_REQD+=			5.8.7
 TOOLS_DEPENDS.perl=		# buildlink3 will handle the dependency
-BUILDLINK_DEPENDS.perl+=	perl>=${PERL5_REQD}
+BUILDLINK_API_DEPENDS.perl+=	perl>=${PERL5_REQD}
 BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
 PERL5_OPTIONS?=		# empty
Index: ./lang/php5/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/php5/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./lang/php5/buildlink3.mk	17 Feb 2006 09:48:01 -0000	1.10
+++ ./lang/php5/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+=		php>=5.1.2
-BUILDLINK_RECOMMENDED.php+=	php>=5.1.2
+BUILDLINK_API_DEPENDS.php+=		php>=5.1.2
+BUILDLINK_ABI_DEPENDS.php+=	php>=5.1.2
 BUILDLINK_PKGSRCDIR.php?=	../../lang/php5
 .endif	# PHP_BUILDLINK3_MK
 
Index: ./lang/pnet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/pnet/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./lang/pnet/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.7
+++ ./lang/pnet/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pnet
 
 .if !empty(PNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnet+=	pnet>=0.6.4
-BUILDLINK_RECOMMENDED.pnet+=	pnet>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnet+=	pnet>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnet+=	pnet>=0.6.6nb2
 BUILDLINK_PKGSRCDIR.pnet?=	../../lang/pnet
 .endif	# PNET_BUILDLINK3_MK
 
Index: ./lang/pnetC/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/pnetC/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/pnetC/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.5
+++ ./lang/pnetC/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pnetC
 
 .if !empty(PNETC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnetC+=	pnetC>=0.6.4
-BUILDLINK_RECOMMENDED.pnetC?=	pnetC>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnetC+=	pnetC>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnetC?=	pnetC>=0.6.6nb2
 BUILDLINK_PKGSRCDIR.pnetC?=	../../lang/pnetC
 .endif	# PNETC_BUILDLINK3_MK
 
Index: ./lang/pnetlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/pnetlib/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./lang/pnetlib/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.6
+++ ./lang/pnetlib/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pnetlib
 
 .if !empty(PNETLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pnetlib+=	pnetlib>=0.6.4
-BUILDLINK_RECOMMENDED.pnetlib+=	pnetlib>=0.6.6nb2
+BUILDLINK_API_DEPENDS.pnetlib+=	pnetlib>=0.6.4
+BUILDLINK_ABI_DEPENDS.pnetlib+=	pnetlib>=0.6.6nb2
 BUILDLINK_PKGSRCDIR.pnetlib?=	../../lang/pnetlib
 .endif	# PNETLIB_BUILDLINK3_MK
 
Index: ./lang/py-extclass/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/py-extclass/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./lang/py-extclass/buildlink3.mk	19 Sep 2005 14:56:26 -0000	1.1
+++ ./lang/py-extclass/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pyextclass
 
 .if !empty(PYEXTCLASS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyextclass+=		py-extclass>=2.2.2nb1
-BUILDLINK_RECOMMENDED.pyextclass+=	py-extclass>=2.2.2nb1
+BUILDLINK_API_DEPENDS.pyextclass+=		py-extclass>=2.2.2nb1
+BUILDLINK_ABI_DEPENDS.pyextclass+=	py-extclass>=2.2.2nb1
 BUILDLINK_PKGSRCDIR.pyextclass?=	../../lang/py-extclass
 .endif	# PYEXTCLASS_BUILDLINK3_MK
 
Index: ./lang/python/pyversion.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/pyversion.mk,v
retrieving revision 1.38
diff -u -r1.38 pyversion.mk
--- ./lang/python/pyversion.mk	4 Nov 2005 18:24:37 -0000	1.38
+++ ./lang/python/pyversion.mk	4 Apr 2006 06:26:54 -0000
@@ -12,12 +12,12 @@
 PYTHON_VERSIONS_ACCEPTED?=		24 23 22 21 20
 PYTHON_VERSIONS_INCOMPATIBLE?=		# empty by default
 
-BUILDLINK_DEPENDS.python15?=		python15>=1.5
-BUILDLINK_DEPENDS.python20?=		python20>=2.0
-BUILDLINK_DEPENDS.python21?=		python21>=2.1
-BUILDLINK_DEPENDS.python22?=		python22>=2.2
-BUILDLINK_DEPENDS.python23?=		python23>=2.3
-BUILDLINK_DEPENDS.python24?=		python24>=2.4
+BUILDLINK_API_DEPENDS.python15?=		python15>=1.5
+BUILDLINK_API_DEPENDS.python20?=		python20>=2.0
+BUILDLINK_API_DEPENDS.python21?=		python21>=2.1
+BUILDLINK_API_DEPENDS.python22?=		python22>=2.2
+BUILDLINK_API_DEPENDS.python23?=		python23>=2.3
+BUILDLINK_API_DEPENDS.python24?=		python24>=2.4
 
 # transform the list into individual variables
 .for pv in ${PYTHON_VERSIONS_ACCEPTED}
@@ -95,38 +95,38 @@
 #
 .if ${_PYTHON_VERSION} == "24"
 PYPKGSRCDIR=	../../lang/python24
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python24}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python24}:${PYPKGSRCDIR}
 PYPACKAGE=	python24
 PYVERSSUFFIX=	2.4
 PYPKGPREFIX=	py24
 .elif ${_PYTHON_VERSION} == "23"
 PYPKGSRCDIR=	../../lang/python23
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR}
 PYPACKAGE=	python23
 PYVERSSUFFIX=	2.3
 PYPKGPREFIX=	py23
 .elif ${_PYTHON_VERSION} == "22"
 PYPKGSRCDIR=	../../lang/python22
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python22}:${PYPKGSRCDIR}
 PYPACKAGE=	python22
 PYVERSSUFFIX=	2.2
 PYPKGPREFIX=	py22
 .elif ${_PYTHON_VERSION} == "21"
 PYPKGSRCDIR=	../../lang/python21
 PYPACKAGE=	python21
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python21}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR}
 PYVERSSUFFIX=	2.1
 PYPKGPREFIX=	py21
 .elif ${_PYTHON_VERSION} == "20"
 PYPKGSRCDIR=	../../lang/python20
 PYPACKAGE=	python20
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python20}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python20}:${PYPKGSRCDIR}
 PYVERSSUFFIX=	2.0
 PYPKGPREFIX=	py20
 .elif ${_PYTHON_VERSION} == "15"
 PYPKGSRCDIR=	../../lang/python15
 PYPACKAGE=	python15
-PYDEPENDENCY=	${BUILDLINK_DEPENDS.python15}:${PYPKGSRCDIR}
+PYDEPENDENCY=	${BUILDLINK_API_DEPENDS.python15}:${PYPKGSRCDIR}
 PYVERSSUFFIX=	1.5
 PYPKGPREFIX=	py15
 .if !defined(PYTHON_DISTUTILS_BOOTSTRAP)
Index: ./lang/python15/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python15/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/python15/buildlink3.mk	5 Mar 2004 19:25:36 -0000	1.4
+++ ./lang/python15/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	python15
 
 .if !empty(PYTHON15_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python15+=	python15>=1.5
+BUILDLINK_API_DEPENDS.python15+=	python15>=1.5
 BUILDLINK_PKGSRCDIR.python15?=	../../lang/python15
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python20/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python20/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/python20/buildlink3.mk	26 Mar 2004 02:27:42 -0000	1.5
+++ ./lang/python20/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	python20
 
 .if !empty(PYTHON20_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python20+=	python20>=2.0
-BUILDLINK_RECOMMENDED.python20?=	python20>=2.0.1nb7
+BUILDLINK_API_DEPENDS.python20+=	python20>=2.0
+BUILDLINK_ABI_DEPENDS.python20?=	python20>=2.0.1nb7
 BUILDLINK_PKGSRCDIR.python20?=	../../lang/python20
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python21/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python21/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/python21/buildlink3.mk	14 Nov 2005 22:53:09 -0000	1.5
+++ ./lang/python21/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	python21
 
 .if !empty(PYTHON21_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python21+=	python21>=2.1
+BUILDLINK_API_DEPENDS.python21+=	python21>=2.1
 BUILDLINK_PKGSRCDIR.python21?=	../../lang/python21
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python22/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python22/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/python22/buildlink3.mk	14 Nov 2005 22:53:09 -0000	1.5
+++ ./lang/python22/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	python22
 
 .if !empty(PYTHON22_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python22+=	python22>=2.2
+BUILDLINK_API_DEPENDS.python22+=	python22>=2.2
 BUILDLINK_PKGSRCDIR.python22?=	../../lang/python22
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python23/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python23/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./lang/python23/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.9
+++ ./lang/python23/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	python23
 
 .if !empty(PYTHON23_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python23+=	python23>=2.3
-BUILDLINK_RECOMMENDED.python23?=	python23>=2.3.5nb6
+BUILDLINK_API_DEPENDS.python23+=	python23>=2.3
+BUILDLINK_ABI_DEPENDS.python23?=	python23>=2.3.5nb6
 BUILDLINK_PKGSRCDIR.python23?=	../../lang/python23
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python23-nth/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python23-nth/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/python23-nth/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.3
+++ ./lang/python23-nth/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	python23-nth
 
 .if !empty(PYTHON23_NTH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python23-nth+=	python23-nth>=2.3.4
-BUILDLINK_RECOMMENDED.python23-nth?=	python23-nth>=2.3.5nb4
+BUILDLINK_API_DEPENDS.python23-nth+=	python23-nth>=2.3.4
+BUILDLINK_ABI_DEPENDS.python23-nth?=	python23-nth>=2.3.5nb4
 BUILDLINK_PKGSRCDIR.python23-nth?=	../../lang/python23-nth
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/python24/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python24/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/python24/buildlink3.mk	5 Feb 2006 23:09:47 -0000	1.3
+++ ./lang/python24/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	python24
 
 .if !empty(PYTHON24_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.python24+=	python24>=2.4
-BUILDLINK_RECOMMENDED.python24?=	python24>=2.4.2nb4
+BUILDLINK_API_DEPENDS.python24+=	python24>=2.4
+BUILDLINK_ABI_DEPENDS.python24?=	python24>=2.4.2nb4
 BUILDLINK_PKGSRCDIR.python24?=	../../lang/python24
 
 .if defined(BUILDLINK_DEPMETHOD.python)
Index: ./lang/ruby/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ruby/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./lang/ruby/buildlink3.mk	2 Nov 2005 07:44:02 -0000	1.6
+++ ./lang/ruby/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -16,8 +16,8 @@
 
 .if !empty(RUBY_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
-BUILDLINK_RECOMMENDED.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_VERSION}
+BUILDLINK_API_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
+BUILDLINK_ABI_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_VERSION}
 BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	../../lang/${RUBY_BASE}
 BUILDLINK_FILES.${RUBY_BASE}+=		lib/libruby${RUBY_VER}.*
 BUILDLINK_FILES.${RUBY_BASE}+=	lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
Index: ./lang/spidermonkey/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/spidermonkey/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/spidermonkey/buildlink3.mk	5 Feb 2006 23:09:51 -0000	1.2
+++ ./lang/spidermonkey/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	spidermonkey
 
 .if !empty(SPIDERMONKEY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.spidermonkey+=	spidermonkey>=1.5
-BUILDLINK_RECOMMENDED.spidermonkey?=	spidermonkey>=1.5nb1
+BUILDLINK_API_DEPENDS.spidermonkey+=	spidermonkey>=1.5
+BUILDLINK_ABI_DEPENDS.spidermonkey?=	spidermonkey>=1.5nb1
 BUILDLINK_PKGSRCDIR.spidermonkey?=	../../lang/spidermonkey
 .endif	# SPIDERMONKEY_BUILDLINK3_MK
 
Index: ./lang/sun-jdk13/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk13/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/sun-jdk13/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.3
+++ ./lang/sun-jdk13/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 
 .if !empty(SUN_JDK13_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.sun-jdk13+=	sun-jdk13-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk13?=	sun-jdk13>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sun-jdk13+=	sun-jdk13-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk13?=	sun-jdk13>=1.0.17nb1
 BUILDLINK_PKGSRCDIR.sun-jdk13?=	../../lang/sun-jdk13
 BUILDLINK_DEPMETHOD.sun-jdk13?= build
 
Index: ./lang/sun-jdk14/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk14/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./lang/sun-jdk14/buildlink3.mk	7 Mar 2006 04:39:19 -0000	1.5
+++ ./lang/sun-jdk14/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 
 .if !empty(SUN_JDK14_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.sun-jdk14+=	sun-jdk14-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk14?=	sun-jdk14>=2.11
+BUILDLINK_API_DEPENDS.sun-jdk14+=	sun-jdk14-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk14?=	sun-jdk14>=2.11
 BUILDLINK_PKGSRCDIR.sun-jdk14?=	../../lang/sun-jdk14
 BUILDLINK_DEPMETHOD.sun-jdk14?= build
 
Index: ./lang/sun-jdk15/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk15/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/sun-jdk15/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.2
+++ ./lang/sun-jdk15/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -12,8 +12,8 @@
 
 .if !empty(SUN_JDK15_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.sun-jdk15+=	sun-jdk15-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jdk15?=	sun-jdk15>=5.0.6nb1
+BUILDLINK_API_DEPENDS.sun-jdk15+=	sun-jdk15-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk15?=	sun-jdk15>=5.0.6nb1
 BUILDLINK_PKGSRCDIR.sun-jdk15?=	../../lang/sun-jdk15
 BUILDLINK_DEPMETHOD.sun-jdk15?= build
 
Index: ./lang/sun-jre13/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre13/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/sun-jre13/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.3
+++ ./lang/sun-jre13/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sun-jre13
 
 .if !empty(SUN_JRE13_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre13+=		sun-jre13-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre13?=		sun-jre13>=1.0.17nb1
+BUILDLINK_API_DEPENDS.sun-jre13+=		sun-jre13-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre13?=		sun-jre13>=1.0.17nb1
 BUILDLINK_PKGSRCDIR.sun-jre13?=		../../lang/sun-jre13
 BUILDLINK_JAVA_PREFIX.sun-jre13=	${PREFIX}/java/sun-1.3
 .endif	# SUN_JRE13_BUILDLINK3_MK
Index: ./lang/sun-jre14/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre14/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/sun-jre14/buildlink3.mk	7 Mar 2006 04:36:21 -0000	1.4
+++ ./lang/sun-jre14/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sun-jre14
 
 .if !empty(SUN_JRE14_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre14+=		sun-jre14-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre14?=	sun-jre14>=2.11
+BUILDLINK_API_DEPENDS.sun-jre14+=		sun-jre14-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre14?=	sun-jre14>=2.11
 BUILDLINK_PKGSRCDIR.sun-jre14?=		../../lang/sun-jre14
 BUILDLINK_JAVA_PREFIX.sun-jre14=	${PREFIX}/java/sun-1.4
 .endif	# SUN_JRE14_BUILDLINK3_MK
Index: ./lang/sun-jre15/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre15/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/sun-jre15/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.3
+++ ./lang/sun-jre15/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sun-jre15
 
 .if !empty(SUN_JRE15_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sun-jre15+=		sun-jre15-[0-9]*
-BUILDLINK_RECOMMENDED.sun-jre15?=		sun-jre15>=5.0.6nb2
+BUILDLINK_API_DEPENDS.sun-jre15+=		sun-jre15-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre15?=		sun-jre15>=5.0.6nb2
 BUILDLINK_PKGSRCDIR.sun-jre15?=		../../lang/sun-jre15
 BUILDLINK_JAVA_PREFIX.sun-jre15=	${PREFIX}/java/sun-1.5
 .endif	# SUN_JRE15_BUILDLINK3_MK
Index: ./lang/tcl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./lang/tcl/buildlink3.mk	25 Nov 2004 22:55:54 -0000	1.15
+++ ./lang/tcl/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+=		tcl>=8.4.6nb1
-BUILDLINK_RECOMMENDED.tcl+=	tcl>=8.4.7nb1
+BUILDLINK_API_DEPENDS.tcl+=		tcl>=8.4.6nb1
+BUILDLINK_ABI_DEPENDS.tcl+=	tcl>=8.4.7nb1
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
Index: ./lang/swi-prolog-lite/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/swi-prolog-lite/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./lang/swi-prolog-lite/buildlink3.mk	20 May 2004 11:09:17 -0000	1.1.1.1
+++ ./lang/swi-prolog-lite/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	swi-prolog-lite
 
 .if !empty(SWI_PROLOG_LITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swi-prolog-lite+=	swi-prolog-lite>=5.2.9
+BUILDLINK_API_DEPENDS.swi-prolog-lite+=	swi-prolog-lite>=5.2.9
 BUILDLINK_PKGSRCDIR.swi-prolog-lite?=	../../lang/swi-prolog-lite
 .endif	# SWI_PROLOG_LITE_BUILDLINK3_MK
 
Index: ./lang/tcl-expect/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-expect/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/tcl-expect/buildlink3.mk	3 Oct 2004 00:15:03 -0000	1.3
+++ ./lang/tcl-expect/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-expect
 
 .if !empty(TCL_EXPECT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb1
-BUILDLINK_RECOMMENDED.tcl-expect+=	tcl-expect>=5.38.0nb2
+BUILDLINK_API_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb1
+BUILDLINK_ABI_DEPENDS.tcl-expect+=	tcl-expect>=5.38.0nb2
 BUILDLINK_PKGSRCDIR.tcl-expect?=	../../lang/tcl-expect
 .endif	# TCL_EXPECT_BUILDLINK3_MK
 
Index: ./lang/tcl-itcl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-itcl/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/tcl-itcl/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.4
+++ ./lang/tcl-itcl/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-itcl
 
 .if !empty(TCL_ITCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1
-BUILDLINK_RECOMMENDED.tcl-itcl?=	tcl-itcl>=3.2.1nb1
+BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1
+BUILDLINK_ABI_DEPENDS.tcl-itcl?=	tcl-itcl>=3.2.1nb1
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../lang/tcl-itcl
 .endif	# TCL_ITCL_BUILDLINK3_MK
 
Index: ./lang/tcl-itcl-current/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-itcl-current/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./lang/tcl-itcl-current/buildlink3.mk	15 Feb 2006 22:02:56 -0000	1.4
+++ ./lang/tcl-itcl-current/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-itcl-current
 
 .if !empty(TCL_ITCL_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-itcl-current+=		tcl-itcl-current>=20040920
-BUILDLINK_RECOMMENDED.tcl-itcl-current?=	tcl-itcl-current>=20040920nb4
+BUILDLINK_API_DEPENDS.tcl-itcl-current+=		tcl-itcl-current>=20040920
+BUILDLINK_ABI_DEPENDS.tcl-itcl-current?=	tcl-itcl-current>=20040920nb4
 BUILDLINK_PKGSRCDIR.tcl-itcl-current?=		../../lang/tcl-itcl-current
 
 BUILDLINK_TRANSFORM+=	l:itcl:itcl33
Index: ./lang/tcl-otcl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-otcl/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./lang/tcl-otcl/buildlink3.mk	5 Feb 2006 23:09:52 -0000	1.3
+++ ./lang/tcl-otcl/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-otcl
 
 .if !empty(TCL_OTCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
-BUILDLINK_RECOMMENDED.tcl-otcl?=	tcl-otcl>=1.11nb1
+BUILDLINK_API_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
+BUILDLINK_ABI_DEPENDS.tcl-otcl?=	tcl-otcl>=1.11nb1
 BUILDLINK_PKGSRCDIR.tcl-otcl?=	../../lang/tcl-otcl
 .endif	# TCL_OTCL_BUILDLINK3_MK
 
Index: ./lang/tcl-tclX/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-tclX/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./lang/tcl-tclX/Makefile	26 Feb 2006 21:11:28 -0000	1.33
+++ ./lang/tcl-tclX/Makefile	4 Apr 2006 06:26:54 -0000
@@ -14,7 +14,7 @@
 .include "../../lang/tcl/Makefile.version"
 
 CONFLICTS+=		tclX-[0-9]*
-BUILDLINK_DEPENDS.tcl+=	tcl>=8.4.7
+BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.7
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
Index: ./lang/tcl-tclX/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl-tclX/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/tcl-tclX/buildlink3.mk	5 Feb 2006 23:09:53 -0000	1.2
+++ ./lang/tcl-tclX/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-tclX
 
 .if !empty(TCL_TCLX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tclX+=	tcl-tclX>=8.3.5
-BUILDLINK_RECOMMENDED.tcl-tclX?=	tcl-tclX>=8.3.5nb3
+BUILDLINK_API_DEPENDS.tcl-tclX+=	tcl-tclX>=8.3.5
+BUILDLINK_ABI_DEPENDS.tcl-tclX?=	tcl-tclX>=8.3.5nb3
 BUILDLINK_PKGSRCDIR.tcl-tclX?=	../../lang/tcl-tclX
 .endif	# TCL_TCLX_BUILDLINK3_MK
 
Index: ./lang/tcl83/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl83/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./lang/tcl83/buildlink3.mk	24 Apr 2004 22:41:20 -0000	1.2
+++ ./lang/tcl83/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+=		tcl-8.3.4*
+BUILDLINK_API_DEPENDS.tcl+=		tcl-8.3.4*
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl83
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
Index: ./lang/win32-jdk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/win32-jdk/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./lang/win32-jdk/buildlink3.mk	11 Oct 2004 13:37:10 -0000	1.1.1.1
+++ ./lang/win32-jdk/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	win32-jdk
 
 .if !empty(WIN32_JDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.win32-jdk+=	win32-jre>=0.1
+BUILDLINK_API_DEPENDS.win32-jdk+=	win32-jre>=0.1
 BUILDLINK_PKGSRCDIR.win32-jdk?=	../../lang/win32-jre
 .endif	# WIN32_JDK_BUILDLINK3_MK
 
Index: ./mail/Pantomime/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/Pantomime/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./mail/Pantomime/buildlink3.mk	12 Mar 2006 14:38:25 -0000	1.4
+++ ./mail/Pantomime/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Pantomime
 
 .if !empty(PANTOMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Pantomime+=	Pantomime>=1.1.2
-BUILDLINK_RECOMMENDED.Pantomime+=	Pantomime>=1.1.2nb3
+BUILDLINK_API_DEPENDS.Pantomime+=	Pantomime>=1.1.2
+BUILDLINK_ABI_DEPENDS.Pantomime+=	Pantomime>=1.1.2nb3
 BUILDLINK_PKGSRCDIR.Pantomime?=	../../mail/Pantomime
 
 .include "../../devel/gnustep-make/gnustep.mk"
Index: ./mail/balsa2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/balsa2/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- ./mail/balsa2/Makefile	21 Mar 2006 06:00:46 -0000	1.52
+++ ./mail/balsa2/Makefile	4 Apr 2006 06:26:54 -0000
@@ -38,7 +38,7 @@
 BUILDLINK_TRANSFORM+=		rm:-DGNOME_VFS_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=		rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.9
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./mail/clamav/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- ./mail/clamav/Makefile	14 Mar 2006 01:14:29 -0000	1.54
+++ ./mail/clamav/Makefile	4 Apr 2006 06:26:54 -0000
@@ -76,7 +76,7 @@
 .if !empty(PKG_OPTIONS:Mcurl)
 .  include "../../www/curl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libcurl
-BUILDLINK_DEPENDS.curl+=curl>=7.10.0
+BUILDLINK_API_DEPENDS.curl+=curl>=7.10.0
 .else
 CONFIGURE_ARGS+=	--without-libcurl
 .endif
Index: ./mail/clamav/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/clamav/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./mail/clamav/buildlink3.mk	5 Feb 2006 23:09:53 -0000	1.8
+++ ./mail/clamav/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	clamav
 
 .if !empty(CLAMAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clamav+=	clamav>=0.60nb1
-BUILDLINK_RECOMMENDED.clamav+=	clamav>=0.88nb1
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.60nb1
+BUILDLINK_ABI_DEPENDS.clamav+=	clamav>=0.88nb1
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
Index: ./mail/dk-milter/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dk-milter/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./mail/dk-milter/Makefile	22 Mar 2006 22:50:32 -0000	1.6
+++ ./mail/dk-milter/Makefile	4 Apr 2006 06:26:54 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=	http://sendmail.net/dk-milter/
 COMMENT=	Open source implementation of DomainKeys for sendmail
 
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 
 LICENSE=		no-profit
 MAKE_ENV+=		M4=${M4:Q}
Index: ./mail/dkim-milter/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/dkim-milter/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./mail/dkim-milter/Makefile	8 Jan 2006 18:20:30 -0000	1.4
+++ ./mail/dkim-milter/Makefile	4 Apr 2006 06:26:54 -0000
@@ -8,7 +8,7 @@
 HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 COMMENT=	Open source DKIM filter software from Sendmail, Inc
 
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
 
 LICENSE=		no-profit
 MAKE_ENV+=		M4=${M4:Q}
Index: ./mail/drac/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/drac/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./mail/drac/buildlink3.mk	25 Apr 2004 01:06:29 -0000	1.2
+++ ./mail/drac/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	drac
 
 .if !empty(DRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.drac+=	drac>=1.10
+BUILDLINK_API_DEPENDS.drac+=	drac>=1.10
 BUILDLINK_PKGSRCDIR.drac?=	../../mail/drac
 BUILDLINK_DEPMETHOD.drac?=	build
 .endif	# DRAC_BUILDLINK3_MK
Index: ./mail/evolution/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- ./mail/evolution/Makefile	21 Mar 2006 06:00:46 -0000	1.102
+++ ./mail/evolution/Makefile	4 Apr 2006 06:26:54 -0000
@@ -83,7 +83,7 @@
 # add rpath flags to the dependency_libs, but there is an strange comment
 # in the wrapper saying that it shouldn't.
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss
-BUILDLINK_DEPENDS.nss+=		nss>=3.9.2nb3
+BUILDLINK_API_DEPENDS.nss+=		nss>=3.9.2nb3
 .  include "../../devel/nss/buildlink3.mk"
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.nss}/include/nss/nss
@@ -108,9 +108,9 @@
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.1
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
-BUILDLINK_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb2
+BUILDLINK_API_DEPENDS.libsoup-devel+=		libsoup-devel>=2.2.3
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=	-lsemaphore
Index: ./mail/evolution/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./mail/evolution/buildlink3.mk	5 Feb 2006 23:09:54 -0000	1.8
+++ ./mail/evolution/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	evolution
 
 .if !empty(EVOLUTION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution+=	evolution>=2.4.1nb3
-BUILDLINK_RECOMMENDED.evolution?=	evolution>=2.4.1nb6
+BUILDLINK_API_DEPENDS.evolution+=	evolution>=2.4.1nb3
+BUILDLINK_ABI_DEPENDS.evolution?=	evolution>=2.4.1nb6
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 .endif	# EVOLUTION_BUILDLINK3_MK
 
Index: ./mail/evolution-data-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution-data-server/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./mail/evolution-data-server/Makefile	6 Mar 2006 00:18:12 -0000	1.34
+++ ./mail/evolution-data-server/Makefile	4 Apr 2006 06:26:54 -0000
@@ -14,7 +14,7 @@
 BUILD_USES_MSGFMT=	yes
 USE_MSGFMT_PLURALS=	yes
 
-BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
+BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.3
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1
Index: ./mail/evolution-data-server/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution-data-server/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./mail/evolution-data-server/buildlink3.mk	5 Feb 2006 23:09:54 -0000	1.14
+++ ./mail/evolution-data-server/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	evolution-data-server
 
 .if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.2.1nb1
-BUILDLINK_RECOMMENDED.evolution-data-server?=	evolution-data-server>=1.4.2.1nb3
+BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.2.1nb1
+BUILDLINK_ABI_DEPENDS.evolution-data-server?=	evolution-data-server>=1.4.2.1nb3
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 .endif	# EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
Index: ./mail/evolution14/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/evolution14/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./mail/evolution14/Makefile	21 Mar 2006 06:00:46 -0000	1.21
+++ ./mail/evolution14/Makefile	4 Apr 2006 06:26:54 -0000
@@ -17,12 +17,12 @@
 DEPENDS+=		psmisc-[0-9]*:../../sysutils/psmisc
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb2
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb2
 
 # Using a wildcard here doesn't make sense because the version number of
 # "db3" is hardcoded in the "configure" script and some source modules
 # to make sure locally stored mails remain in the same format!
-BUILDLINK_DEPENDS.db3=		db3-3.11.2{,nb*}
+BUILDLINK_API_DEPENDS.db3=		db3-3.11.2{,nb*}
 
 .include "options.mk"
 
Index: ./mail/faces/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/faces/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./mail/faces/buildlink3.mk	5 Feb 2006 23:09:54 -0000	1.4
+++ ./mail/faces/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	faces
 
 .if !empty(FACES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faces+=	faces>=1.6.1nb1
-BUILDLINK_RECOMMENDED.faces+=	faces>=1.6.1nb4
+BUILDLINK_API_DEPENDS.faces+=	faces>=1.6.1nb1
+BUILDLINK_ABI_DEPENDS.faces+=	faces>=1.6.1nb4
 BUILDLINK_PKGSRCDIR.faces?=	../../mail/faces
 .endif	# FACES_BUILDLINK3_MK
 
Index: ./mail/gmime/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/gmime/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./mail/gmime/buildlink3.mk	5 Feb 2006 23:09:55 -0000	1.6
+++ ./mail/gmime/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gmime
 
 .if !empty(GMIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.7
-BUILDLINK_RECOMMENDED.gmime+=	gmime>=2.1.9nb1
+BUILDLINK_API_DEPENDS.gmime+=	gmime>=2.1.7
+BUILDLINK_ABI_DEPENDS.gmime+=	gmime>=2.1.9nb1
 BUILDLINK_PKGSRCDIR.gmime?=	../../mail/gmime
 .endif	# GMIME_BUILDLINK3_MK
 
Index: ./mail/imap-uw/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/imap-uw/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./mail/imap-uw/buildlink3.mk	5 Oct 2005 15:49:44 -0000	1.5
+++ ./mail/imap-uw/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	imap-uw
 
 .if !empty(IMAP_UW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004
-BUILDLINK_RECOMMENDED.imap-uw+=	imap-uw>=2004enb1
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004
+BUILDLINK_ABI_DEPENDS.imap-uw+=	imap-uw>=2004enb1
 BUILDLINK_PKGSRCDIR.imap-uw?=	../../mail/imap-uw
 #
 # Make "-limapuw" resolve into "-lc-client".
Index: ./mail/imap-uw-utils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/imap-uw-utils/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./mail/imap-uw-utils/Makefile	4 Mar 2006 21:30:00 -0000	1.23
+++ ./mail/imap-uw-utils/Makefile	4 Apr 2006 06:26:54 -0000
@@ -12,7 +12,7 @@
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004c1nb1
 
 SRCDIRS=	icat ifrom
 
Index: ./mail/libesmtp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libesmtp/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./mail/libesmtp/buildlink3.mk	5 Feb 2006 23:09:55 -0000	1.7
+++ ./mail/libesmtp/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libesmtp
 
 .if !empty(LIBESMTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libesmtp+=	libesmtp>=1.0rc1nb1
-BUILDLINK_RECOMMENDED.libesmtp?=	libesmtp>=1.0.3nb2
+BUILDLINK_API_DEPENDS.libesmtp+=	libesmtp>=1.0rc1nb1
+BUILDLINK_ABI_DEPENDS.libesmtp?=	libesmtp>=1.0.3nb2
 BUILDLINK_PKGSRCDIR.libesmtp?=	../../mail/libesmtp
 
 LIBESMTP=	-lesmtp
Index: ./mail/libetpan/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libetpan/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./mail/libetpan/buildlink3.mk	8 Mar 2006 06:33:31 -0000	1.6
+++ ./mail/libetpan/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libetpan
 
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetpan+=	libetpan>=0.38nb1
-BUILDLINK_RECOMMENDED.libetpan?=	libetpan>=0.43
+BUILDLINK_API_DEPENDS.libetpan+=	libetpan>=0.38nb1
+BUILDLINK_ABI_DEPENDS.libetpan?=	libetpan>=0.43
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
Index: ./mail/libmilter/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libmilter/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./mail/libmilter/buildlink3.mk	30 Aug 2004 20:26:18 -0000	1.2
+++ ./mail/libmilter/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmilter
 
 .if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.13.1
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.1
 BUILDLINK_PKGSRCDIR.libmilter?=	../../mail/libmilter
 BUILDLINK_DEPMETHOD.libmilter?=	build
 
Index: ./mail/libmilter/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libmilter/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./mail/libmilter/builtin.mk	1 Jun 2005 18:02:59 -0000	1.3
+++ ./mail/libmilter/builtin.mk	4 Apr 2006 06:26:54 -0000
@@ -33,7 +33,7 @@
 .    if defined(BUILTIN_PKG.libmilter) && \
         !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
 .        if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
Index: ./mail/libmilter812/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libmilter812/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./mail/libmilter812/buildlink3.mk	30 Aug 2004 20:53:20 -0000	1.1.1.1
+++ ./mail/libmilter812/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libmilter
 
 .if !empty(LIBMILTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmilter+=	libmilter>=8.12.9nb1
+BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.12.9nb1
 BUILDLINK_PKGSRCDIR.libmilter?=	../../mail/libmilter812
 BUILDLINK_DEPMETHOD.libmilter?=	build
 
Index: ./mail/libmilter812/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libmilter812/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./mail/libmilter812/builtin.mk	1 Jun 2005 18:02:59 -0000	1.2
+++ ./mail/libmilter812/builtin.mk	4 Apr 2006 06:26:54 -0000
@@ -33,7 +33,7 @@
 .    if defined(BUILTIN_PKG.libmilter) && \
         !empty(IS_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libmilter}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libmilter}
 .        if !empty(USE_BUILTIN.libmilter:M[yY][eE][sS])
 USE_BUILTIN.libmilter!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libmilter:Q}; then \
Index: ./mail/libspf-alt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libspf-alt/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./mail/libspf-alt/Makefile	5 Feb 2006 23:09:55 -0000	1.12
+++ ./mail/libspf-alt/Makefile	4 Apr 2006 06:26:54 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=	http://www.midwestcs.com/spf/libspf-alt/
 COMMENT=	Sender Permitted Framework (SPF) library
 
-BUILDLINK_DEPENDS.bind+=	bind>=9.2.3nb3
+BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.3nb3
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind}
Index: ./mail/libspf-alt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libspf-alt/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./mail/libspf-alt/buildlink3.mk	5 Feb 2006 23:09:55 -0000	1.4
+++ ./mail/libspf-alt/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libspf_alt
 
 .if !empty(LIBSPF_ALT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
-BUILDLINK_RECOMMENDED.libspf_alt+=	libspf_alt>=0.4.0nb3
+BUILDLINK_API_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.libspf_alt+=	libspf_alt>=0.4.0nb3
 BUILDLINK_PKGSRCDIR.libspf_alt?=	../../mail/libspf-alt
 .endif	# LIBSPF_ALT_BUILDLINK3_MK
 
Index: ./mail/p5-Mail-ClamAV/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/p5-Mail-ClamAV/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./mail/p5-Mail-ClamAV/Makefile	4 Mar 2006 21:30:01 -0000	1.18
+++ ./mail/p5-Mail-ClamAV/Makefile	4 Apr 2006 06:26:54 -0000
@@ -12,7 +12,7 @@
 DEPENDS+=	p5-Inline>=0.40:../../devel/p5-Inline
 
 # this version needs clamav>=0.80
-BUILDLINK_DEPENDS.clamav+=	clamav>=0.80
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.80
 
 PERL5_PACKLIST=		auto/Mail/ClamAV/.packlist
 PTHREAD_OPTS+=		require
Index: ./mail/perdition/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/perdition/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./mail/perdition/buildlink3.mk	5 Feb 2006 23:09:57 -0000	1.2
+++ ./mail/perdition/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	perdition
 
 .if !empty(PERDITION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.perdition+=	perdition>=1.17
-BUILDLINK_RECOMMENDED.perdition?=	perdition>=1.17nb1
+BUILDLINK_API_DEPENDS.perdition+=	perdition>=1.17
+BUILDLINK_ABI_DEPENDS.perdition?=	perdition>=1.17nb1
 BUILDLINK_PKGSRCDIR.perdition?=	../../mail/perdition
 .endif	# PERDITION_BUILDLINK3_MK
 
Index: ./mail/pine/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/pine/Makefile,v
retrieving revision 1.109
diff -u -r1.109 Makefile
--- ./mail/pine/Makefile	4 Mar 2006 21:30:01 -0000	1.109
+++ ./mail/pine/Makefile	4 Apr 2006 06:26:54 -0000
@@ -104,7 +104,7 @@
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
 # 2004e contains extensions needed by Pine 4.63
-BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004e
+BUILDLINK_API_DEPENDS.imap-uw+=	imap-uw>=2004e
 .include "../../mail/imap-uw/buildlink3.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
Index: ./mail/squirrelmail/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/squirrelmail/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./mail/squirrelmail/buildlink3.mk	27 Feb 2006 07:12:13 -0000	1.7
+++ ./mail/squirrelmail/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	squirrelmail
 
 .if !empty(SQUIRRELMAIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.squirrelmail+=	{ja-,}squirrelmail>=1.4.6
-BUILDLINK_RECOMMENDED.squirrelmail?=	squirrelmail>=1.4.6
+BUILDLINK_API_DEPENDS.squirrelmail+=	{ja-,}squirrelmail>=1.4.6
+BUILDLINK_ABI_DEPENDS.squirrelmail?=	squirrelmail>=1.4.6
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
Index: ./mail/sylpheed-claws/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/sylpheed-claws/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./mail/sylpheed-claws/buildlink3.mk	5 Feb 2006 23:09:58 -0000	1.6
+++ ./mail/sylpheed-claws/buildlink3.mk	4 Apr 2006 06:26:54 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sylpheed-claws
 
 .if !empty(SYLPHEED_CLAWS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sylpheed-claws+=	sylpheed-claws>=0.9.7nb1
-BUILDLINK_RECOMMENDED.sylpheed-claws?=	sylpheed-claws>=1.0.4nb1
+BUILDLINK_API_DEPENDS.sylpheed-claws+=	sylpheed-claws>=0.9.7nb1
+BUILDLINK_ABI_DEPENDS.sylpheed-claws?=	sylpheed-claws>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.sylpheed-claws?=	../../mail/sylpheed-claws
 .endif	# SYLPHEED_CLAWS_BUILDLINK3_MK
 
Index: ./math/R/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- ./math/R/Makefile	5 Mar 2006 16:27:27 -0000	1.81
+++ ./math/R/Makefile	4 Apr 2006 06:26:54 -0000
@@ -78,7 +78,7 @@
 R_LIBDIR=		${PREFIX}/lib/R
 R_INSTALL_DIRS=		${R_LIBDIR}
 
-BUILDLINK_DEPENDS.zlib+= zlib>=1.2.1
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
 
 .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*)
 CONFIGURE_ARGS+=	--enable-mbcs=no
Index: ./math/R/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/R/buildlink3.mk	5 Feb 2006 23:09:59 -0000	1.2
+++ ./math/R/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	R
 
 .if !empty(R_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.R+=	R>=1.7.0
-BUILDLINK_RECOMMENDED.R?=	R>=2.2.1nb2
+BUILDLINK_API_DEPENDS.R+=	R>=1.7.0
+BUILDLINK_ABI_DEPENDS.R?=	R>=2.2.1nb2
 BUILDLINK_PKGSRCDIR.R?=	../../math/R
 .endif	# R_BUILDLINK3_MK
 
Index: ./math/blas/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/blas/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/blas/buildlink3.mk	3 Oct 2004 00:12:55 -0000	1.3
+++ ./math/blas/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	blas
 
 .if !empty(BLAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blas+=	blas>=1.0nb2
-BUILDLINK_RECOMMENDED.blas+=	blas>=1.0nb3
+BUILDLINK_API_DEPENDS.blas+=	blas>=1.0nb2
+BUILDLINK_ABI_DEPENDS.blas+=	blas>=1.0nb3
 BUILDLINK_PKGSRCDIR.blas?=	../../math/blas
 .endif	# BLAS_BUILDLINK3_MK
 
Index: ./math/cln/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/cln/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./math/cln/buildlink3.mk	12 Mar 2006 16:33:32 -0000	1.5
+++ ./math/cln/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cln
 
 .if !empty(CLN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cln+=		cln>=1.1.6
-BUILDLINK_RECOMMENDED.cln+=	cln>=1.1.9nb1
+BUILDLINK_API_DEPENDS.cln+=		cln>=1.1.6
+BUILDLINK_ABI_DEPENDS.cln+=	cln>=1.1.9nb1
 BUILDLINK_PKGSRCDIR.cln?=	../../math/cln
 .endif	# CLN_BUILDLINK3_MK
 
Index: ./math/djbfft/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/djbfft/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./math/djbfft/buildlink3.mk	18 Apr 2004 17:51:41 -0000	1.1
+++ ./math/djbfft/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	djbfft
 
 .if !empty(DJBFFT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.djbfft+=	djbfft>=0.76
+BUILDLINK_API_DEPENDS.djbfft+=	djbfft>=0.76
 BUILDLINK_PKGSRCDIR.djbfft?=	../../math/djbfft
 BUILDLINK_DEPMETHOD.djbfft?=	build
 .endif	# DJBFFT_BUILDLINK3_MK
Index: ./math/fftw/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/fftw/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./math/fftw/buildlink3.mk	5 Feb 2006 23:10:01 -0000	1.4
+++ ./math/fftw/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fftw
 
 .if !empty(FFTW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftw+=	fftw>=3.0
-BUILDLINK_RECOMMENDED.fftw+=	fftw>=3.1nb1
+BUILDLINK_API_DEPENDS.fftw+=	fftw>=3.0
+BUILDLINK_ABI_DEPENDS.fftw+=	fftw>=3.1nb1
 BUILDLINK_PKGSRCDIR.fftw?=	../../math/fftw
 .endif	# FFTW_BUILDLINK3_MK
 
Index: ./math/fftw2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/fftw2/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/fftw2/buildlink3.mk	5 Feb 2006 23:10:01 -0000	1.3
+++ ./math/fftw2/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fftw2
 
 .if !empty(FFTW2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftw2+=	fftw2>=2.1.3
-BUILDLINK_RECOMMENDED.fftw2?=	fftw2>=2.1.5nb2
+BUILDLINK_API_DEPENDS.fftw2+=	fftw2>=2.1.3
+BUILDLINK_ABI_DEPENDS.fftw2?=	fftw2>=2.1.5nb2
 BUILDLINK_PKGSRCDIR.fftw2?=	../../math/fftw2
 .endif	# FFTW2_BUILDLINK3_MK
 
Index: ./math/fftwf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/fftwf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/fftwf/buildlink3.mk	5 Feb 2006 23:10:01 -0000	1.2
+++ ./math/fftwf/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fftwf
 
 .if !empty(FFTWF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fftwf+=	fftwf>=3.0
-BUILDLINK_RECOMMENDED.fftwf+=	fftwf>=3.0.1nb1
+BUILDLINK_API_DEPENDS.fftwf+=	fftwf>=3.0
+BUILDLINK_ABI_DEPENDS.fftwf+=	fftwf>=3.0.1nb1
 BUILDLINK_PKGSRCDIR.fftwf?=	../../math/fftwf
 .endif	# FFTWF_BUILDLINK3_MK
 
Index: ./math/glpk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/glpk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/glpk/buildlink3.mk	5 Feb 2006 23:10:02 -0000	1.2
+++ ./math/glpk/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	glpk
 
 .if !empty(GLPK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glpk+=	glpk>=4.8nb1
-BUILDLINK_RECOMMENDED.glpk?=	glpk>=4.9nb1
+BUILDLINK_API_DEPENDS.glpk+=	glpk>=4.8nb1
+BUILDLINK_ABI_DEPENDS.glpk?=	glpk>=4.9nb1
 BUILDLINK_PKGSRCDIR.glpk?=	../../math/glpk
 .endif	# GLPK_BUILDLINK3_MK
 
Index: ./math/gnumeric/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/gnumeric/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- ./math/gnumeric/Makefile	21 Mar 2006 06:00:46 -0000	1.108
+++ ./math/gnumeric/Makefile	4 Apr 2006 06:26:55 -0000
@@ -48,9 +48,9 @@
 .include "../../lang/python/application.mk"
 .include "../../misc/goffice/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../print/libgnomeprint/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.2
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
Index: ./math/gsl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/gsl/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/gsl/buildlink3.mk	3 Oct 2004 00:12:56 -0000	1.3
+++ ./math/gsl/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gsl
 
 .if !empty(GSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsl+=		gsl>=1.4
-BUILDLINK_RECOMMENDED.gsl+=	gsl>=1.5nb1
+BUILDLINK_API_DEPENDS.gsl+=		gsl>=1.4
+BUILDLINK_ABI_DEPENDS.gsl+=	gsl>=1.5nb1
 BUILDLINK_PKGSRCDIR.gsl?=	../../math/gsl
 .endif	# GSL_BUILDLINK3_MK
 
Index: ./math/guppi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/guppi/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./math/guppi/buildlink3.mk	5 Feb 2006 23:10:02 -0000	1.5
+++ ./math/guppi/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	guppi
 
 .if !empty(GUPPI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.guppi+=	guppi>=0.40.3nb13
-BUILDLINK_RECOMMENDED.guppi?=	guppi>=0.40.3nb15
+BUILDLINK_API_DEPENDS.guppi+=	guppi>=0.40.3nb13
+BUILDLINK_ABI_DEPENDS.guppi?=	guppi>=0.40.3nb15
 BUILDLINK_PKGSRCDIR.guppi?=	../../math/guppi
 .endif	# GUPPI_BUILDLINK3_MK
 
Index: ./math/lapack/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/lapack/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/lapack/buildlink3.mk	3 Oct 2004 00:12:56 -0000	1.3
+++ ./math/lapack/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lapack
 
 .if !empty(LAPACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lapack+=	lapack>=20010201nb1
-BUILDLINK_RECOMMENDED.lapack+=	lapack>=20010201nb2
+BUILDLINK_API_DEPENDS.lapack+=	lapack>=20010201nb1
+BUILDLINK_ABI_DEPENDS.lapack+=	lapack>=20010201nb2
 BUILDLINK_PKGSRCDIR.lapack?=	../../math/lapack
 .endif	# LAPACK_BUILDLINK3_MK
 
Index: ./math/libffm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/libffm/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/libffm/buildlink3.mk	5 Feb 2006 23:10:02 -0000	1.3
+++ ./math/libffm/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libffm
 
 .if !empty(LIBFFM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libffm+=	libffm>=0.28
-BUILDLINK_RECOMMENDED.libffm?=	libffm>=0.28nb1
+BUILDLINK_API_DEPENDS.libffm+=	libffm>=0.28
+BUILDLINK_ABI_DEPENDS.libffm?=	libffm>=0.28nb1
 BUILDLINK_PKGSRCDIR.libffm?=	../../math/libffm
 .endif	# LIBFFM_BUILDLINK3_MK
 
Index: ./math/libmatheval/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/libmatheval/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./math/libmatheval/buildlink3.mk	5 Feb 2006 23:10:02 -0000	1.4
+++ ./math/libmatheval/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmatheval
 
 .if !empty(LIBMATHEVAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatheval+=	libmatheval>=1.1.0
-BUILDLINK_RECOMMENDED.libmatheval+=	libmatheval>=1.1.1nb3
+BUILDLINK_API_DEPENDS.libmatheval+=	libmatheval>=1.1.0
+BUILDLINK_ABI_DEPENDS.libmatheval+=	libmatheval>=1.1.1nb3
 BUILDLINK_PKGSRCDIR.libmatheval?=	../../math/libmatheval
 .endif	# LIBMATHEVAL_BUILDLINK3_MK
 
Index: ./math/ltm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/ltm/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/ltm/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.2
+++ ./math/ltm/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ltm
 
 .if !empty(LTM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ltm+=	ltm>=0.30
-BUILDLINK_RECOMMENDED.ltm?=	ltm>=0.30nb1
+BUILDLINK_API_DEPENDS.ltm+=	ltm>=0.30
+BUILDLINK_ABI_DEPENDS.ltm?=	ltm>=0.30nb1
 BUILDLINK_PKGSRCDIR.ltm?=	../../math/ltm
 BUILDLINK_DEPMETHOD.ltm?=	build
 .endif	# LTM_BUILDLINK3_MK
Index: ./math/mathomatic/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/mathomatic/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- ./math/mathomatic/Makefile	26 Mar 2006 18:45:07 -0000	1.63
+++ ./math/mathomatic/Makefile	4 Apr 2006 06:26:55 -0000
@@ -19,7 +19,7 @@
 
 INSTALLATION_DIRS=	bin man/man1
 
-BUILDLINK_DEPENDS.readline+=	readline>=5.1pl1nb1
+BUILDLINK_API_DEPENDS.readline+=	readline>=5.1pl1nb1
 .include "../../devel/readline/buildlink3.mk"
 
 do-install:
Index: ./math/mpfr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/mpfr/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./math/mpfr/buildlink3.mk	5 Jun 2004 22:19:53 -0000	1.1
+++ ./math/mpfr/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	mpfr
 
 .if !empty(MPFR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpfr+=	mpfr>=2.0.3
+BUILDLINK_API_DEPENDS.mpfr+=	mpfr>=2.0.3
 BUILDLINK_DEPMETHOD.mpfr?=	build
 BUILDLINK_PKGSRCDIR.mpfr?=	../../math/mpfr
 .endif	# MPFR_BUILDLINK3_MK
Index: ./math/ntl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/ntl/buildlink3.mk	3 Oct 2004 00:12:57 -0000	1.2
+++ ./math/ntl/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ntl
 
 .if !empty(NTL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ntl+=	ntl>=5.3.1
-BUILDLINK_RECOMMENDED.ntl+=	ntl>=5.3.1nb1
+BUILDLINK_API_DEPENDS.ntl+=	ntl>=5.3.1
+BUILDLINK_ABI_DEPENDS.ntl+=	ntl>=5.3.1nb1
 BUILDLINK_PKGSRCDIR.ntl?=	../../math/ntl
 .endif	# NTL_BUILDLINK3_MK
 
Index: ./math/octave/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./math/octave/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.4
+++ ./math/octave/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	octave
 
 .if !empty(OCTAVE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave+=	octave>=2.1.69
-BUILDLINK_RECOMMENDED.octave?=	octave>=2.1.72nb1
+BUILDLINK_API_DEPENDS.octave+=	octave>=2.1.69
+BUILDLINK_ABI_DEPENDS.octave?=	octave>=2.1.72nb1
 BUILDLINK_PKGSRCDIR.octave?=	../../math/octave
 .endif	# OCTAVE_BUILDLINK3_MK
 
Index: ./math/octave-current/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave-current/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./math/octave-current/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.6
+++ ./math/octave-current/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	octave-current
 
 .if !empty(OCTAVE_CURRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave-current+=	octave-current>=2.1.57
-BUILDLINK_RECOMMENDED.octave-current+=	octave-current>=2.9.4nb1
+BUILDLINK_API_DEPENDS.octave-current+=	octave-current>=2.1.57
+BUILDLINK_ABI_DEPENDS.octave-current+=	octave-current>=2.9.4nb1
 BUILDLINK_PKGSRCDIR.octave-current?=	../../math/octave-current
 .endif	# OCTAVE_CURRENT_BUILDLINK3_MK
 
Index: ./math/octave-forge/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave-forge/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/octave-forge/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.3
+++ ./math/octave-forge/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	octave-forge
 
 .if !empty(OCTAVE_FORGE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.octave-forge+=	octave-forge>=2005.06.13
-BUILDLINK_RECOMMENDED.octave-forge?=	octave-forge>=2005.06.13nb1
+BUILDLINK_API_DEPENDS.octave-forge+=	octave-forge>=2005.06.13
+BUILDLINK_ABI_DEPENDS.octave-forge?=	octave-forge>=2005.06.13nb1
 BUILDLINK_PKGSRCDIR.octave-forge?=	../../math/octave-forge
 .endif	# OCTAVE_FORGE_BUILDLINK3_MK
 
Index: ./math/pari/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/pari/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/pari/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.3
+++ ./math/pari/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pari
 
 .if !empty(PARI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pari+=	pari>=2.1.5nb1
-BUILDLINK_RECOMMENDED.pari+=	pari>=2.1.6nb1
+BUILDLINK_API_DEPENDS.pari+=	pari>=2.1.5nb1
+BUILDLINK_ABI_DEPENDS.pari+=	pari>=2.1.6nb1
 BUILDLINK_PKGSRCDIR.pari?=	../../math/pari
 .endif	# PARI_BUILDLINK3_MK
 
Index: ./math/py-Numeric/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Numeric/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./math/py-Numeric/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.8
+++ ./math/py-Numeric/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pynumeric
 
 .if !empty(PY_NUMERIC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-[0-9]*
-BUILDLINK_RECOMMENDED.pynumeric?=	${PYPKGPREFIX}-Numeric>=23.7nb1
+BUILDLINK_API_DEPENDS.pynumeric+=	${PYPKGPREFIX}-Numeric-[0-9]*
+BUILDLINK_ABI_DEPENDS.pynumeric?=	${PYPKGPREFIX}-Numeric>=23.7nb1
 BUILDLINK_PKGSRCDIR.pynumeric?=	../../math/py-Numeric
 .endif	# PY_NUMERIC_BUILDLINK3_MK
 
Index: ./math/py-Scientific/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-Scientific/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./math/py-Scientific/Makefile	24 Mar 2006 10:59:19 -0000	1.26
+++ ./math/py-Scientific/Makefile	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 
 CONFLICTS+=	py-Scientific-*
 
-BUILDLINK_DEPENDS.python20+=	python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21+=	python21>=2.1.1nb1
+BUILDLINK_API_DEPENDS.python20+=	python20>=2.0.1nb1
+BUILDLINK_API_DEPENDS.python21+=	python21>=2.1.1nb1
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
Index: ./math/py-fpconst/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-fpconst/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/py-fpconst/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.2
+++ ./math/py-fpconst/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	py-fpconst
 
 .if !empty(PY_FPCONST_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-fpconst+=	${PYPKGPREFIX}-fpconst>=0.7.0
-BUILDLINK_RECOMMENDED.py-fpconst?=	${PYPKGPREFIX}-fpconst>=0.7.0nb1
+BUILDLINK_API_DEPENDS.py-fpconst+=	${PYPKGPREFIX}-fpconst>=0.7.0
+BUILDLINK_ABI_DEPENDS.py-fpconst?=	${PYPKGPREFIX}-fpconst>=0.7.0nb1
 BUILDLINK_PKGSRCDIR.py-fpconst?=	../../math/py-fpconst
 .endif	# PY_FPCONST_BUILDLINK3_MK
 
Index: ./math/py-numarray/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-numarray/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./math/py-numarray/buildlink3.mk	5 Feb 2006 23:10:03 -0000	1.3
+++ ./math/py-numarray/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pynumarray
 
 .if !empty(PY_NUMARRAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pynumarray+=	${PYPKGPREFIX}-numarray>=1.1.1
-BUILDLINK_RECOMMENDED.pynumarray?=	${PYPKGPREFIX}-numarray>=1.3.3nb1
+BUILDLINK_API_DEPENDS.pynumarray+=	${PYPKGPREFIX}-numarray>=1.1.1
+BUILDLINK_ABI_DEPENDS.pynumarray?=	${PYPKGPREFIX}-numarray>=1.3.3nb1
 BUILDLINK_PKGSRCDIR.pynumarray?=	../../math/py-numarray
 .endif	# PY_NUMARRAY_BUILDLINK3_MK
 
Index: ./math/py-rpy/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/py-rpy/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./math/py-rpy/Makefile	4 Mar 2006 21:30:08 -0000	1.14
+++ ./math/py-rpy/Makefile	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 
 PYDISTUTILSPKG=		YES
 
-BUILDLINK_DEPENDS.R+= R>=2.2.1
+BUILDLINK_API_DEPENDS.R+= R>=2.2.1
 
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
Index: ./math/qalculate/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/qalculate/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./math/qalculate/buildlink3.mk	5 Feb 2006 23:10:04 -0000	1.5
+++ ./math/qalculate/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qalculate
 
 .if !empty(QALCULATE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qalculate+=	qalculate>=0.8.2
-BUILDLINK_RECOMMENDED.qalculate?=	qalculate>=0.8.2nb2
+BUILDLINK_API_DEPENDS.qalculate+=	qalculate>=0.8.2
+BUILDLINK_ABI_DEPENDS.qalculate?=	qalculate>=0.8.2nb2
 BUILDLINK_PKGSRCDIR.qalculate?=	../../math/qalculate
 .endif	# QALCULATE_BUILDLINK3_MK
 
Index: ./math/scilab/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/scilab/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./math/scilab/buildlink3.mk	5 Feb 2006 23:10:04 -0000	1.5
+++ ./math/scilab/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	scilab
 
 .if !empty(SCILAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.scilab+=	scilab>=3.0
-BUILDLINK_RECOMMENDED.scilab?=	scilab>=3.1.1nb2
+BUILDLINK_API_DEPENDS.scilab+=	scilab>=3.0
+BUILDLINK_ABI_DEPENDS.scilab?=	scilab>=3.1.1nb2
 BUILDLINK_PKGSRCDIR.scilab?=	../../math/scilab
 
 BUILDLINK_FILES.scilab+=	lib/scilab-${SCIVERSION}/Version.incl
Index: ./math/slatec/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/slatec/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/slatec/buildlink3.mk	3 Oct 2004 00:12:57 -0000	1.2
+++ ./math/slatec/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	slatec
 
 .if !empty(SLATEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.slatec+=	slatec>=4.1nb1
-BUILDLINK_RECOMMENDED.slatec+=	slatec>=4.1nb2
+BUILDLINK_API_DEPENDS.slatec+=	slatec>=4.1nb1
+BUILDLINK_ABI_DEPENDS.slatec+=	slatec>=4.1nb2
 BUILDLINK_PKGSRCDIR.slatec?=	../../math/slatec
 .endif	# SLATEC_BUILDLINK3_MK
 
Index: ./math/superlu/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/superlu/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./math/superlu/buildlink3.mk	25 Apr 2004 21:38:03 -0000	1.1
+++ ./math/superlu/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	superlu
 
 .if !empty(SUPERLU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.superlu+=	superlu>=2.0nb2
+BUILDLINK_API_DEPENDS.superlu+=	superlu>=2.0nb2
 BUILDLINK_PKGSRCDIR.superlu?=	../../math/superlu
 BUILDLINK_DEPMETHOD.superlu?=	build
 .endif	# SUPERLU_BUILDLINK3_MK
Index: ./math/tasp-vsipl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/tasp-vsipl/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/tasp-vsipl/buildlink3.mk	5 Feb 2006 23:10:04 -0000	1.2
+++ ./math/tasp-vsipl/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tasp-vsipl
 
 .if !empty(TASP_VSIPL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tasp-vsipl+=	tasp-vsipl>=20030710
-BUILDLINK_RECOMMENDED.tasp-vsipl?=	tasp-vsipl>=20030710nb1
+BUILDLINK_API_DEPENDS.tasp-vsipl+=	tasp-vsipl>=20030710
+BUILDLINK_ABI_DEPENDS.tasp-vsipl?=	tasp-vsipl>=20030710nb1
 BUILDLINK_PKGSRCDIR.tasp-vsipl?=	../../math/tasp-vsipl
 .endif	# TASP_VSIPL_BUILDLINK3_MK
 
Index: ./math/udunits/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/udunits/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./math/udunits/buildlink3.mk	22 Mar 2004 17:29:02 -0000	1.1
+++ ./math/udunits/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	udunits
 
 .if !empty(UDUNITS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.udunits+=	udunits>=1.11.7
+BUILDLINK_API_DEPENDS.udunits+=	udunits>=1.11.7
 BUILDLINK_PKGSRCDIR.udunits?=	../../math/udunits
 BUILDLINK_DEPMETHOD.udunits?=	build
 BUILDLINK_FILES.udunits=	include/udunits.inc
Index: ./math/yorick/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/math/yorick/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./math/yorick/buildlink3.mk	5 Feb 2006 23:10:04 -0000	1.2
+++ ./math/yorick/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	yorick
 
 .if !empty(YORICK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.yorick+=	yorick>=1.5.12
+BUILDLINK_API_DEPENDS.yorick+=	yorick>=1.5.12
 BUILDLINK_DEPMETHOD.yorick?=	build
-BUILDLINK_RECOMMENDED.yorick?=	yorick>=1.6.02nb1
+BUILDLINK_ABI_DEPENDS.yorick?=	yorick>=1.6.02nb1
 BUILDLINK_PKGSRCDIR.yorick?=	../../math/yorick
 .endif	# YORICK_BUILDLINK3_MK
 
Index: ./mbone/common-mml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mbone/common-mml/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./mbone/common-mml/buildlink3.mk	5 Apr 2005 10:34:00 -0000	1.1
+++ ./mbone/common-mml/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	common-mml
 
 .if !empty(COMMON_MML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.common-mml+=	common-mml>=1.2.0nb1
+BUILDLINK_API_DEPENDS.common-mml+=	common-mml>=1.2.0nb1
 BUILDLINK_PKGSRCDIR.common-mml?=	../../mbone/common-mml
 .endif	# COMMON_MML_BUILDLINK3_MK
 
Index: ./meta-pkgs/kde3/kde3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/kde3/kde3.mk,v
retrieving revision 1.12
diff -u -r1.12 kde3.mk
--- ./meta-pkgs/kde3/kde3.mk	5 Jan 2006 10:08:59 -0000	1.12
+++ ./meta-pkgs/kde3/kde3.mk	4 Apr 2006 06:26:55 -0000
@@ -92,7 +92,7 @@
 
 _IN_ARTS_BUILD?=	no
 .if !empty(_IN_ARTS_BUILD:M[nN][oO])
-BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.3.3nb1
+BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3.3nb1
 .include "../../x11/qt3-libs/buildlink3.mk"
 .endif
 
Index: ./meta-pkgs/xfce4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/xfce4/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./meta-pkgs/xfce4/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.11
+++ ./meta-pkgs/xfce4/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4
 
 .if !empty(XFCE4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4+=	xfce4>=4.2.3.1
-BUILDLINK_RECOMMENDED.xfce4?=	xfce4>=4.2.3.2nb2
+BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.2.3.1
+BUILDLINK_ABI_DEPENDS.xfce4?=	xfce4>=4.2.3.2nb2
 BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 .endif	# XFCE4_BUILDLINK3_MK
 
Index: ./misc/Addresses/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/Addresses/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./misc/Addresses/buildlink3.mk	5 Feb 2006 23:10:06 -0000	1.5
+++ ./misc/Addresses/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Addresses
 
 .if !empty(ADDRESSES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Addresses+=	Addresses>=0.4.5
-BUILDLINK_RECOMMENDED.Addresses+=	Addresses>=0.4.6nb3
+BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.5
+BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.6nb3
 BUILDLINK_PKGSRCDIR.Addresses?=	../../misc/Addresses
 
 .include "../../devel/gnustep-make/gnustep.mk"
Index: ./misc/gnome2-utils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/gnome2-utils/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- ./misc/gnome2-utils/Makefile	21 Mar 2006 06:00:47 -0000	1.52
+++ ./misc/gnome2-utils/Makefile	4 Apr 2006 06:26:55 -0000
@@ -27,7 +27,7 @@
 GCONF2_SCHEMAS+=	gnome-search-tool.schemas
 GCONF2_SCHEMAS+=	logview.schemas
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.4
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.4
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/GConf2-ui/buildlink3.mk"
Index: ./misc/goffice/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/goffice/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./misc/goffice/Makefile	6 Mar 2006 00:18:12 -0000	1.6
+++ ./misc/goffice/Makefile	4 Apr 2006 06:26:55 -0000
@@ -19,7 +19,7 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -27,7 +27,7 @@
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
Index: ./misc/goffice/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/goffice/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./misc/goffice/buildlink3.mk	5 Feb 2006 23:10:09 -0000	1.3
+++ ./misc/goffice/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	goffice
 
 .if !empty(GOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goffice+=	goffice>=0.1.2
-BUILDLINK_RECOMMENDED.goffice?=	goffice>=0.2.0nb1
+BUILDLINK_API_DEPENDS.goffice+=	goffice>=0.1.2
+BUILDLINK_ABI_DEPENDS.goffice?=	goffice>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.goffice?=	../../misc/goffice
 .endif	# GOFFICE_BUILDLINK3_MK
 
Index: ./misc/kdepim3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/kdepim3/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- ./misc/kdepim3/Makefile	30 Mar 2006 02:52:17 -0000	1.58
+++ ./misc/kdepim3/Makefile	4 Apr 2006 06:26:55 -0000
@@ -15,7 +15,7 @@
 
 .include "../../mk/bsd.options.mk"
 
-BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
+BUILDLINK_API_DEPENDS.gpgme+=     gpgme>=0.4.5
 
 REPLACE_PERL+=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.1-use-UOID-for-identities.pl \
Index: ./misc/kdepim3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/kdepim3/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./misc/kdepim3/buildlink3.mk	5 Feb 2006 23:10:10 -0000	1.14
+++ ./misc/kdepim3/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdepim
 
 .if !empty(KDEPIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdepim+=	kdepim>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdepim?=	kdepim>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdepim+=	kdepim>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdepim?=	kdepim>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
 .endif	# KDEPIM_BUILDLINK3_MK
 
Index: ./misc/koffice/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/koffice/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./misc/koffice/buildlink3.mk	5 Feb 2006 23:10:10 -0000	1.8
+++ ./misc/koffice/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	koffice
 
 .if !empty(KOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.koffice?=	koffice>=1.4.2nb5
-BUILDLINK_RECOMMENDED.koffice?=	koffice>=1.4.2nb8
+BUILDLINK_API_DEPENDS.koffice?=	koffice>=1.4.2nb5
+BUILDLINK_ABI_DEPENDS.koffice?=	koffice>=1.4.2nb8
 BUILDLINK_PKGSRCDIR.koffice?=	../../misc/koffice
 .endif	# KOFFICE_BUILDLINK3_MK
 
Index: ./misc/libcdio/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/libcdio/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./misc/libcdio/buildlink3.mk	5 Feb 2006 23:10:12 -0000	1.6
+++ ./misc/libcdio/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcdio
 
 .if !empty(LIBCDIO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcdio+=	libcdio>=0.65
-BUILDLINK_RECOMMENDED.libcdio+=	libcdio>=0.76nb1
+BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.65
+BUILDLINK_ABI_DEPENDS.libcdio+=	libcdio>=0.76nb1
 BUILDLINK_PKGSRCDIR.libcdio?=	../../misc/libcdio
 .endif	# LIBCDIO_BUILDLINK3_MK
 
Index: ./misc/libutf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/libutf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./misc/libutf/buildlink3.mk	3 Oct 2004 00:13:00 -0000	1.2
+++ ./misc/libutf/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libutf
 
 .if !empty(LIBUTF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libutf+=	libutf>=2.10nb1
-BUILDLINK_RECOMMENDED.libutf+=	libutf>=2.10nb2
+BUILDLINK_API_DEPENDS.libutf+=	libutf>=2.10nb1
+BUILDLINK_ABI_DEPENDS.libutf+=	libutf>=2.10nb2
 BUILDLINK_PKGSRCDIR.libutf?=	../../misc/libutf
 .endif	# LIBUTF_BUILDLINK3_MK
 
Index: ./misc/proj/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/proj/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./misc/proj/buildlink3.mk	5 Feb 2006 23:10:13 -0000	1.3
+++ ./misc/proj/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	proj
 
 .if !empty(PROJ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.proj+=	proj>=4.4.7nb1
-BUILDLINK_RECOMMENDED.proj?=	proj>=4.4.7nb2
+BUILDLINK_API_DEPENDS.proj+=	proj>=4.4.7nb1
+BUILDLINK_ABI_DEPENDS.proj?=	proj>=4.4.7nb2
 BUILDLINK_PKGSRCDIR.proj?=	../../misc/proj
 .endif	# PROJ_BUILDLINK3_MK
 
Index: ./misc/rpm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/rpm/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./misc/rpm/buildlink3.mk	5 Feb 2006 23:10:14 -0000	1.5
+++ ./misc/rpm/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rpm
 
 .if !empty(RPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rpm+=	rpm>=2.5.4nb4
-BUILDLINK_RECOMMENDED.rpm?=	rpm>=2.5.4nb5
+BUILDLINK_API_DEPENDS.rpm+=	rpm>=2.5.4nb4
+BUILDLINK_ABI_DEPENDS.rpm?=	rpm>=2.5.4nb5
 BUILDLINK_PKGSRCDIR.rpm?=	../../misc/rpm
 BUILDLINK_DEPMETHOD.rpm?=	build
 
Index: ./misc/xfce4-weather-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/misc/xfce4-weather-plugin/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./misc/xfce4-weather-plugin/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.6
+++ ./misc/xfce4-weather-plugin/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-weather-plugin
 
 .if !empty(XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-weather-plugin+=	xfce4-weather-plugin>=0.4.9
-BUILDLINK_RECOMMENDED.xfce4-weather-plugin?=	xfce4-weather-plugin>=0.4.9nb2
+BUILDLINK_API_DEPENDS.xfce4-weather-plugin+=	xfce4-weather-plugin>=0.4.9
+BUILDLINK_ABI_DEPENDS.xfce4-weather-plugin?=	xfce4-weather-plugin>=0.4.9nb2
 BUILDLINK_PKGSRCDIR.xfce4-weather-plugin?=	../../misc/xfce4-weather-plugin
 .endif	# XFCE4_WEATHER_PLUGIN_BUILDLINK3_MK
 
Index: ./misc/yelp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/yelp/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- ./misc/yelp/Makefile	21 Mar 2006 06:00:47 -0000	1.45
+++ ./misc/yelp/Makefile	4 Apr 2006 06:26:55 -0000
@@ -14,7 +14,7 @@
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.4
 
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake pkg-config
@@ -32,7 +32,7 @@
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 # Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+=     firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+=     firefox>=1.5nb2
 .endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
Index: ./multimedia/dirac/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/dirac/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./multimedia/dirac/buildlink3.mk	16 May 2004 02:07:44 -0000	1.1.1.1
+++ ./multimedia/dirac/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	dirac
 
 .if !empty(DIRAC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirac+=	dirac>=0.2.0
+BUILDLINK_API_DEPENDS.dirac+=	dirac>=0.2.0
 BUILDLINK_PKGSRCDIR.dirac?=	../../multimedia/dirac
 BUILDLINK_DEPMETHOD.dirac?=	build
 .endif	# DIRAC_BUILDLINK3_MK
Index: ./multimedia/dvdrip/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/dvdrip/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./multimedia/dvdrip/Makefile	4 Mar 2006 21:30:14 -0000	1.22
+++ ./multimedia/dvdrip/Makefile	4 Apr 2006 06:26:55 -0000
@@ -24,7 +24,7 @@
 #DEPENDS+=	rar>=2.02:../../archivers/rar
 .endif
 
-BUILDLINK_DEPENDS.perl+=	perl>=5.6.0
+BUILDLINK_API_DEPENDS.perl+=	perl>=5.6.0
 
 USE_PKGLOCALEDIR=	YES
 
Index: ./multimedia/ffmpeg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./multimedia/ffmpeg/buildlink3.mk	22 Feb 2006 10:30:18 -0000	1.5
+++ ./multimedia/ffmpeg/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ffmpeg
 
 .if !empty(FFMPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.9pre1
-BUILDLINK_RECOMMENDED.ffmpeg?=	ffmpeg>=0.4.9pre1
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.9pre1
+BUILDLINK_ABI_DEPENDS.ffmpeg?=	ffmpeg>=0.4.9pre1
 BUILDLINK_PKGSRCDIR.ffmpeg?=	../../multimedia/ffmpeg
 .endif	# FFMPEG_BUILDLINK3_MK
 
Index: ./multimedia/gnome2-media/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gnome2-media/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./multimedia/gnome2-media/buildlink3.mk	5 Feb 2006 23:10:15 -0000	1.5
+++ ./multimedia/gnome2-media/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-media
 
 .if !empty(GNOME_MEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
-BUILDLINK_RECOMMENDED.gnome-media?=	gnome-media>=2.12.0nb5
+BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.12.0nb5
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome2-media
 .endif	# GNOME_MEDIA_BUILDLINK3_MK
 
Index: ./multimedia/gst-plugins0.10-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-base/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/gst-plugins0.10-base/buildlink3.mk	5 Feb 2006 23:10:15 -0000	1.2
+++ ./multimedia/gst-plugins0.10-base/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.10-base
 
 .if !empty(GST_PLUGINS0.10_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-base?=	gst-plugins0.10-base>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base?=	gst-plugins0.10-base>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-base?=	../../multimedia/gst-plugins0.10-base
 .endif	# GST_PLUGINS0.10_BASE_BUILDLINK3_MK
 
Index: ./multimedia/gst-plugins0.10-good/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.10-good/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/gst-plugins0.10-good/buildlink3.mk	5 Feb 2006 23:10:15 -0000	1.2
+++ ./multimedia/gst-plugins0.10-good/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.10-good
 
 .if !empty(GST_PLUGINS0.10_GOOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.1
-BUILDLINK_RECOMMENDED.gst-plugins0.10-good?=	gst-plugins0.10-good>=0.10.1nb1
+BUILDLINK_API_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.1
+BUILDLINK_ABI_DEPENDS.gst-plugins0.10-good?=	gst-plugins0.10-good>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.gst-plugins0.10-good?=	../../multimedia/gst-plugins0.10-good
 .endif	# GST_PLUGINS0.10_GOOD_BUILDLINK3_MK
 
Index: ./multimedia/gst-plugins0.8/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.8/Makefile.common,v
retrieving revision 1.1
diff -u -r1.1 Makefile.common
--- ./multimedia/gst-plugins0.8/Makefile.common	18 Jan 2006 12:44:03 -0000	1.1
+++ ./multimedia/gst-plugins0.8/Makefile.common	4 Apr 2006 06:26:55 -0000
@@ -163,7 +163,7 @@
 .include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .endif
 
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./multimedia/gst-plugins0.8/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.8/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/gst-plugins0.8/buildlink3.mk	5 Feb 2006 23:10:15 -0000	1.3
+++ ./multimedia/gst-plugins0.8/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.8
 
 .if !empty(GST_PLUGINS0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8?=	gst-plugins0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8?=	gst-plugins0.8>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8?=	../../multimedia/gst-plugins0.8
 .endif	# GST_PLUGINS0.8_BUILDLINK3_MK
 
Index: ./multimedia/gst-plugins0.8-xvid/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gst-plugins0.8-xvid/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./multimedia/gst-plugins0.8-xvid/Makefile	21 Mar 2006 06:00:47 -0000	1.5
+++ ./multimedia/gst-plugins0.8-xvid/Makefile	4 Apr 2006 06:26:55 -0000
@@ -4,7 +4,7 @@
 GST_PLUGINS0.8_NAME=	xvid
 GST_PLUGINS0.8_DIR=	ext/xvid
 
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
+BUILDLINK_API_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
 PKGREVISION=		4
Index: ./multimedia/gstreamer0.10/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gstreamer0.10/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./multimedia/gstreamer0.10/Makefile	12 Mar 2006 12:41:09 -0000	1.5
+++ ./multimedia/gstreamer0.10/Makefile	4 Apr 2006 06:26:55 -0000
@@ -41,7 +41,7 @@
 .if ${OPSYS} == "NetBSD"
 # We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
 # won't work at all.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .endif
 .undef f
 
Index: ./multimedia/gstreamer0.10/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gstreamer0.10/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/gstreamer0.10/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.2
+++ ./multimedia/gstreamer0.10/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gstreamer0.10
 
 .if !empty(GSTREAMER0.10_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.1
-BUILDLINK_RECOMMENDED.gstreamer0.10?=	gstreamer0.10>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.1
+BUILDLINK_ABI_DEPENDS.gstreamer0.10?=	gstreamer0.10>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gstreamer0.10?=	../../multimedia/gstreamer0.10
 
 PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \
Index: ./multimedia/gstreamer0.8/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gstreamer0.8/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./multimedia/gstreamer0.8/Makefile	21 Mar 2006 06:00:47 -0000	1.5
+++ ./multimedia/gstreamer0.8/Makefile	4 Apr 2006 06:26:55 -0000
@@ -39,7 +39,7 @@
 .if ${OPSYS} == "NetBSD"
 # We must have a glib2 compiled with the RTLD_GLOBAL fix; if not, plugins
 # won't work at all.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .endif
 .undef f
 
Index: ./multimedia/gstreamer0.8/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gstreamer0.8/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/gstreamer0.8/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.3
+++ ./multimedia/gstreamer0.8/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gstreamer0.8
 
 .if !empty(GSTREAMER0.8_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
-BUILDLINK_RECOMMENDED.gstreamer0.8?=	gstreamer0.8>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
+BUILDLINK_ABI_DEPENDS.gstreamer0.8?=	gstreamer0.8>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gstreamer0.8?=	../../multimedia/gstreamer0.8
 
 PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
Index: ./multimedia/gstreamer0.8/plugins.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/gstreamer0.8/plugins.mk,v
retrieving revision 1.2
diff -u -r1.2 plugins.mk
--- ./multimedia/gstreamer0.8/plugins.mk	14 Mar 2006 01:14:31 -0000	1.2
+++ ./multimedia/gstreamer0.8/plugins.mk	4 Apr 2006 06:26:55 -0000
@@ -24,7 +24,7 @@
 .if defined(_GSTREAMER0.8_NO_DEPEND)
 BUILDLINK_PREFIX.gstreamer0.8=	${LOCALBASE}
 .else
-BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.1
+BUILDLINK_API_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.1
 .  include "../../multimedia/gstreamer0.8/buildlink3.mk"
 .endif
 
Index: ./multimedia/kdemultimedia3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/kdemultimedia3/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- ./multimedia/kdemultimedia3/Makefile	30 Mar 2006 02:48:36 -0000	1.44
+++ ./multimedia/kdemultimedia3/Makefile	4 Apr 2006 06:26:55 -0000
@@ -18,7 +18,7 @@
 
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc0anb1
+BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc0anb1
 .endif
 
 CONFIGURE_ARGS+=	--enable-cdparanoia
Index: ./multimedia/kdemultimedia3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/kdemultimedia3/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./multimedia/kdemultimedia3/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.10
+++ ./multimedia/kdemultimedia3/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdemultimedia
 
 .if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdemultimedia?=	kdemultimedia>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdemultimedia?=	kdemultimedia>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
Index: ./multimedia/libassetml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libassetml/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/libassetml/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.2
+++ ./multimedia/libassetml/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libassetml
 
 .if !empty(LIBASSETML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassetml+=	libassetml>=1.2.1
-BUILDLINK_RECOMMENDED.libassetml?=	libassetml>=1.2.1nb1
+BUILDLINK_API_DEPENDS.libassetml+=	libassetml>=1.2.1
+BUILDLINK_ABI_DEPENDS.libassetml?=	libassetml>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.libassetml?=	../../multimedia/libassetml
 .endif	# LIBASSETML_BUILDLINK3_MK
 
Index: ./multimedia/libdv/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdv/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./multimedia/libdv/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.4
+++ ./multimedia/libdv/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdv
 
 .if !empty(LIBDV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.102
-BUILDLINK_RECOMMENDED.libdv+=	libdv>=0.104nb2
+BUILDLINK_API_DEPENDS.libdv+=	libdv>=0.102
+BUILDLINK_ABI_DEPENDS.libdv+=	libdv>=0.104nb2
 BUILDLINK_PKGSRCDIR.libdv?=	../../multimedia/libdv
 .endif	# LIBDV_BUILDLINK3_MK
 
Index: ./multimedia/libdv-tools/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdv-tools/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./multimedia/libdv-tools/Makefile	5 Feb 2006 23:10:16 -0000	1.2
+++ ./multimedia/libdv-tools/Makefile	4 Apr 2006 06:26:55 -0000
@@ -12,7 +12,7 @@
 BUILD_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
 INSTALL_DIRS=		${WRKSRC}/encodedv ${WRKSRC}/playdv
 
-BUILDLINK_DEPENDS.libdv+=	libdv>=0.104nb1
+BUILDLINK_API_DEPENDS.libdv+=	libdv>=0.104nb1
 
 .include "../../devel/glib/buildlink3.mk"
 .include "../../multimedia/libdv/buildlink3.mk"
Index: ./multimedia/libdvbpsi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdvbpsi/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/libdvbpsi/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.3
+++ ./multimedia/libdvbpsi/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdvbpsi
 
 .if !empty(LIBDVBPSI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
-BUILDLINK_RECOMMENDED.libdvbpsi+=	libdvbpsi>=0.1.3nb2
+BUILDLINK_API_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3
+BUILDLINK_ABI_DEPENDS.libdvbpsi+=	libdvbpsi>=0.1.3nb2
 BUILDLINK_PKGSRCDIR.libdvbpsi?=	../../multimedia/libdvbpsi
 .endif	# LIBDVBPSI_BUILDLINK3_MK
 
Index: ./multimedia/libdvdcss/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdvdcss/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/libdvdcss/buildlink3.mk	3 Oct 2004 00:13:02 -0000	1.2
+++ ./multimedia/libdvdcss/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdvdcss
 
 .if !empty(LIBDVDCSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
-BUILDLINK_RECOMMENDED.libdvdcss+=	libdvdcss>=1.2.8nb1
+BUILDLINK_API_DEPENDS.libdvdcss+=	libdvdcss>=1.2.4
+BUILDLINK_ABI_DEPENDS.libdvdcss+=	libdvdcss>=1.2.8nb1
 BUILDLINK_PKGSRCDIR.libdvdcss?=	../../multimedia/libdvdcss
 .endif	# LIBDVDCSS_BUILDLINK3_MK
 
Index: ./multimedia/libdvdnav/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdvdnav/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/libdvdnav/buildlink3.mk	3 Oct 2004 00:13:02 -0000	1.2
+++ ./multimedia/libdvdnav/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdvdnav
 
 .if !empty(LIBDVDNAV_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
-BUILDLINK_RECOMMENDED.libdvdnav+=	libdvdnav>=0.1.9nb1
+BUILDLINK_API_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9
+BUILDLINK_ABI_DEPENDS.libdvdnav+=	libdvdnav>=0.1.9nb1
 BUILDLINK_PKGSRCDIR.libdvdnav?=	../../multimedia/libdvdnav
 .endif	# LIBDVDNAV_BUILDLINK3_MK
 
Index: ./multimedia/libdvdplay/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdvdplay/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/libdvdplay/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.3
+++ ./multimedia/libdvdplay/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdvdplay
 
 .if !empty(LIBDVDPLAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
-BUILDLINK_RECOMMENDED.libdvdplay+=	libdvdplay>=1.0.1nb3
+BUILDLINK_API_DEPENDS.libdvdplay+=		libdvdplay>=1.0.1
+BUILDLINK_ABI_DEPENDS.libdvdplay+=	libdvdplay>=1.0.1nb3
 BUILDLINK_PKGSRCDIR.libdvdplay?=	../../multimedia/libdvdplay
 .endif	# LIBDVDPLAY_BUILDLINK3_MK
 
Index: ./multimedia/libdvdread/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libdvdread/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./multimedia/libdvdread/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.4
+++ ./multimedia/libdvdread/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdvdread
 
 .if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdvdread+=		libdvdread>=0.9.4
-BUILDLINK_RECOMMENDED.libdvdread+=	libdvdread>=0.9.5nb2
+BUILDLINK_API_DEPENDS.libdvdread+=		libdvdread>=0.9.4
+BUILDLINK_ABI_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb2
 BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
 .endif	# LIBDVDREAD_BUILDLINK3_MK
 
Index: ./multimedia/libflash/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libflash/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/libflash/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.3
+++ ./multimedia/libflash/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libflash
 
 .if !empty(LIBFLASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libflash+=	libflash>=0.4.10nb4
-BUILDLINK_RECOMMENDED.libflash+=	libflash>=0.4.10nb6
+BUILDLINK_API_DEPENDS.libflash+=	libflash>=0.4.10nb4
+BUILDLINK_ABI_DEPENDS.libflash+=	libflash>=0.4.10nb6
 BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
 .endif	# LIBFLASH_BUILDLINK3_MK
 
Index: ./multimedia/libmatroska/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libmatroska/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./multimedia/libmatroska/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.11
+++ ./multimedia/libmatroska/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -16,8 +16,8 @@
 BUILDLINK_PACKAGES+=	libmatroska
 
 .if !empty(LIBMATROSKA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmatroska+=	libmatroska>=0.8.0
-BUILDLINK_RECOMMENDED.libmatroska?=	libmatroska>=0.8.0nb1
+BUILDLINK_API_DEPENDS.libmatroska+=	libmatroska>=0.8.0
+BUILDLINK_ABI_DEPENDS.libmatroska?=	libmatroska>=0.8.0nb1
 BUILDLINK_PKGSRCDIR.libmatroska?=	../../multimedia/libmatroska
 .endif	# LIBMATROSKA_BUILDLINK3_MK
 
Index: ./multimedia/libmpeg2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libmpeg2/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./multimedia/libmpeg2/buildlink3.mk	5 Feb 2006 23:10:16 -0000	1.4
+++ ./multimedia/libmpeg2/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmpeg2
 
 .if !empty(LIBMPEG2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
-BUILDLINK_RECOMMENDED.libmpeg2+=	libmpeg2>=0.4.0bnb3
+BUILDLINK_API_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0
+BUILDLINK_ABI_DEPENDS.libmpeg2+=	libmpeg2>=0.4.0bnb3
 BUILDLINK_PKGSRCDIR.libmpeg2?=	../../multimedia/libmpeg2
 .endif	# LIBMPEG2_BUILDLINK3_MK
 
Index: ./multimedia/libmpeg3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libmpeg3/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/libmpeg3/buildlink3.mk	5 Feb 2006 23:10:17 -0000	1.2
+++ ./multimedia/libmpeg3/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmpeg3
 
 .if !empty(LIBMPEG3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
-BUILDLINK_RECOMMENDED.libmpeg3?=	libmpeg3>=1.3nb6
+BUILDLINK_API_DEPENDS.libmpeg3+=	libmpeg3>=1.3nb4
+BUILDLINK_ABI_DEPENDS.libmpeg3?=	libmpeg3>=1.3nb6
 BUILDLINK_PKGSRCDIR.libmpeg3?=	../../multimedia/libmpeg3
 .endif	# LIBMPEG3_BUILDLINK3_MK
 
Index: ./multimedia/libogg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libogg/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/libogg/buildlink3.mk	3 Oct 2004 00:13:03 -0000	1.2
+++ ./multimedia/libogg/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	libogg
 
 .if !empty(LIBOGG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libogg+=	libogg>=1.1
-BUILDLINK_RECOMMENDED.libogg+=	libogg>=1.1.2nb1
+BUILDLINK_API_DEPENDS.libogg+=	libogg>=1.1
+BUILDLINK_ABI_DEPENDS.libogg+=	libogg>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.libogg?=	../../multimedia/libogg
 .endif	# LIBOGG_BUILDLINK3_MK
 
Index: ./multimedia/libtheora/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/libtheora/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/libtheora/buildlink3.mk	3 Oct 2004 00:13:03 -0000	1.3
+++ ./multimedia/libtheora/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtheora
 
 .if !empty(LIBTHEORA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtheora+=	libtheora>=1.0alpha3
-BUILDLINK_RECOMMENDED.libtheora+=	libtheora>=1.0alpha3nb1
+BUILDLINK_API_DEPENDS.libtheora+=	libtheora>=1.0alpha3
+BUILDLINK_ABI_DEPENDS.libtheora+=	libtheora>=1.0alpha3nb1
 BUILDLINK_PKGSRCDIR.libtheora?=	../../multimedia/libtheora
 .endif	# LIBTHEORA_BUILDLINK3_MK
 
Index: ./multimedia/lsdvd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/lsdvd/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./multimedia/lsdvd/Makefile	26 Feb 2006 05:03:21 -0000	1.7
+++ ./multimedia/lsdvd/Makefile	4 Apr 2006 06:26:55 -0000
@@ -14,7 +14,7 @@
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		autoconf213
 
-BUILDLINK_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb1
+BUILDLINK_API_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb1
 
 pre-configure:
 	cd ${WRKSRC}; autoconf
Index: ./multimedia/ming/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ming/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./multimedia/ming/buildlink3.mk	4 Nov 2005 02:59:54 -0000	1.1.1.1
+++ ./multimedia/ming/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	ming
 
 .if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ming+=	ming>=0.2
+BUILDLINK_API_DEPENDS.ming+=	ming>=0.2
 BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
 .endif	# MING_BUILDLINK3_MK
 
Index: ./multimedia/mjpegtools/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mjpegtools/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./multimedia/mjpegtools/buildlink3.mk	5 Feb 2006 23:10:17 -0000	1.10
+++ ./multimedia/mjpegtools/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	mjpegtools
 
 .if !empty(MJPEGTOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
-BUILDLINK_RECOMMENDED.mjpegtools?=	mjpegtools>=1.8.0nb3
+BUILDLINK_API_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
+BUILDLINK_ABI_DEPENDS.mjpegtools?=	mjpegtools>=1.8.0nb3
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
 .endif	# MJPEGTOOLS_BUILDLINK3_MK
 
Index: ./multimedia/mpeg-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mpeg-lib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./multimedia/mpeg-lib/buildlink3.mk	3 Oct 2004 00:13:03 -0000	1.2
+++ ./multimedia/mpeg-lib/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mpeg
 
 .if !empty(MPEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpeg+=	mpeg>=1.3.1
-BUILDLINK_RECOMMENDED.mpeg+=	mpeg>=1.3.1nb1
+BUILDLINK_API_DEPENDS.mpeg+=	mpeg>=1.3.1
+BUILDLINK_ABI_DEPENDS.mpeg+=	mpeg>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.mpeg?=	../../multimedia/mpeg-lib
 .endif	# MPEG_BUILDLINK3_MK
 
Index: ./multimedia/ogle/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ogle/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/ogle/buildlink3.mk	5 Feb 2006 23:10:17 -0000	1.3
+++ ./multimedia/ogle/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ogle
 
 .if !empty(OGLE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ogle+=	ogle>=0.9.2
-BUILDLINK_RECOMMENDED.ogle+=	ogle>=0.9.2nb3
+BUILDLINK_API_DEPENDS.ogle+=	ogle>=0.9.2
+BUILDLINK_ABI_DEPENDS.ogle+=	ogle>=0.9.2nb3
 BUILDLINK_PKGSRCDIR.ogle?=	../../multimedia/ogle
 .endif	# OGLE_BUILDLINK3_MK
 
Index: ./multimedia/openquicktime/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/openquicktime/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./multimedia/openquicktime/buildlink3.mk	5 Feb 2006 23:10:18 -0000	1.3
+++ ./multimedia/openquicktime/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openquicktime
 
 .if !empty(OPENQUICKTIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
-BUILDLINK_RECOMMENDED.openquicktime?=	openquicktime>=1.0nb4
+BUILDLINK_API_DEPENDS.openquicktime+=	openquicktime>=1.0nb2
+BUILDLINK_ABI_DEPENDS.openquicktime?=	openquicktime>=1.0nb4
 BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
 .endif	# OPENQUICKTIME_BUILDLINK3_MK
 
Index: ./multimedia/smpeg/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/smpeg/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./multimedia/smpeg/buildlink3.mk	5 Feb 2006 23:10:18 -0000	1.6
+++ ./multimedia/smpeg/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	smpeg
 
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
-BUILDLINK_RECOMMENDED.smpeg+=	smpeg>=0.4.4nb12
+BUILDLINK_API_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
+BUILDLINK_ABI_DEPENDS.smpeg+=	smpeg>=0.4.4nb12
 BUILDLINK_PKGSRCDIR.smpeg?=	../../multimedia/smpeg
 .endif	# SMPEG_BUILDLINK3_MK
 
Index: ./multimedia/swfdec/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/swfdec/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./multimedia/swfdec/buildlink3.mk	5 Feb 2006 23:10:18 -0000	1.5
+++ ./multimedia/swfdec/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	swfdec
 
 .if !empty(SWFDEC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.swfdec+=	swfdec>=0.2.2
-BUILDLINK_RECOMMENDED.swfdec+=	swfdec>=0.2.2nb5
+BUILDLINK_API_DEPENDS.swfdec+=	swfdec>=0.2.2
+BUILDLINK_ABI_DEPENDS.swfdec+=	swfdec>=0.2.2nb5
 BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 .endif	# SWFDEC_BUILDLINK3_MK
 
Index: ./multimedia/totem/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/totem/Makefile.common,v
retrieving revision 1.13
diff -u -r1.13 Makefile.common
--- ./multimedia/totem/Makefile.common	18 Jan 2006 12:55:55 -0000	1.13
+++ ./multimedia/totem/Makefile.common	4 Apr 2006 06:26:55 -0000
@@ -26,13 +26,13 @@
 GCONF2_SCHEMAS+=	totem-handlers.schemas
 GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.totem
 .include "../../www/mozilla/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
-BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 
 .include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
Index: ./multimedia/vlc/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ./multimedia/vlc/Makefile	9 Mar 2006 21:04:45 -0000	1.28
+++ ./multimedia/vlc/Makefile	4 Apr 2006 06:26:55 -0000
@@ -23,8 +23,8 @@
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=        --disable-vcd
 .endif
-BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
-BUILDLINK_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
+BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.ffmpeg+=	ffmpeg>=0.4.8nb1 # Postprocess fix
 
 CONFIGURE_ARGS+=	--disable-skins2
 CONFIGURE_ARGS+=	--disable-speex # needs unstable 1.1.x branch
Index: ./multimedia/vlc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./multimedia/vlc/buildlink3.mk	5 Feb 2006 23:10:18 -0000	1.8
+++ ./multimedia/vlc/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -14,8 +14,8 @@
 
 .if !empty(VLC_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		vlc
-BUILDLINK_DEPENDS.vlc?=		vlc>=0.7.1
-BUILDLINK_RECOMMENDED.vlc?=	vlc>=0.7.2nb9
+BUILDLINK_API_DEPENDS.vlc?=		vlc>=0.7.1
+BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=0.7.2nb9
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 .endif # VLC_BUILDLINK3_MK
 
Index: ./multimedia/x264-devel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/x264-devel/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./multimedia/x264-devel/buildlink3.mk	12 Feb 2006 14:11:22 -0000	1.1.1.1
+++ ./multimedia/x264-devel/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -12,7 +12,7 @@
 BUILDLINK_PACKAGES+=	x264-devel
 
 .if !empty(X264_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.x264-devel+=	x264-devel>=20060127
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20060127
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 .endif	# X264_DEVEL_BUILDLINK3_MK
 
Index: ./multimedia/xine-lib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./multimedia/xine-lib/Makefile	5 Feb 2006 23:10:18 -0000	1.31
+++ ./multimedia/xine-lib/Makefile	4 Apr 2006 06:26:55 -0000
@@ -6,7 +6,7 @@
 
 COMMENT=		Multimedia player library
 
-BUILDLINK_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
+BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
 SUBST_CLASSES+=		oss w32path
 
@@ -24,7 +24,7 @@
 SUBST_MESSAGE.w32path=	"Fixing win32 dll path."
 
 # Needed to fix build problems under, at least, NetBSD/amd64.
-BUILDLINK_DEPENDS.libcdio+=	libcdio>=0.75
+BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.75
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
Index: ./multimedia/xine-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-lib/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./multimedia/xine-lib/buildlink3.mk	5 Feb 2006 23:10:19 -0000	1.13
+++ ./multimedia/xine-lib/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	xine-lib
 
 .if !empty(XINE_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc3c
-BUILDLINK_RECOMMENDED.xine-lib+=xine-lib>=1.0.3a
-BUILDLINK_RECOMMENDED.xine-lib?=	xine-lib>=1.0.3anb5
+BUILDLINK_API_DEPENDS.xine-lib+=	xine-lib>=1rc3c
+BUILDLINK_ABI_DEPENDS.xine-lib+=xine-lib>=1.0.3a
+BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.0.3anb5
 BUILDLINK_PKGSRCDIR.xine-lib?=	../../multimedia/xine-lib
 .endif	# XINE_LIB_BUILDLINK3_MK
 
Index: ./multimedia/xine-ui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xine-ui/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./multimedia/xine-ui/Makefile	4 Mar 2006 21:30:16 -0000	1.20
+++ ./multimedia/xine-ui/Makefile	4 Apr 2006 06:26:55 -0000
@@ -12,7 +12,7 @@
 
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.curl+=	curl>7.10.2
+BUILDLINK_API_DEPENDS.curl+=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
 USE_DIRS+=		xdg-1.1
Index: ./multimedia/xvidcore/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/xvidcore/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./multimedia/xvidcore/buildlink3.mk	13 Mar 2006 18:24:45 -0000	1.7
+++ ./multimedia/xvidcore/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xvidcore
 
 .if !empty(XVIDCORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.0
-BUILDLINK_RECOMMENDED.xvidcore?=	xvidcore>=1.1.0nb1
+BUILDLINK_API_DEPENDS.xvidcore+=	xvidcore>=1.0.0
+BUILDLINK_ABI_DEPENDS.xvidcore?=	xvidcore>=1.1.0nb1
 BUILDLINK_PKGSRCDIR.xvidcore?=	../../multimedia/xvidcore
 .endif	# XVIDCORE_BUILDLINK3_MK
 
Index: ./net/GeoIP/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/GeoIP/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/GeoIP/buildlink3.mk	3 Oct 2004 00:17:48 -0000	1.3
+++ ./net/GeoIP/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	GeoIP
 
 .if !empty(GEOIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GeoIP+=	GeoIP>=1.3.1
-BUILDLINK_RECOMMENDED.GeoIP+=	GeoIP>=1.3.4nb1
+BUILDLINK_API_DEPENDS.GeoIP+=	GeoIP>=1.3.1
+BUILDLINK_ABI_DEPENDS.GeoIP+=	GeoIP>=1.3.4nb1
 BUILDLINK_PKGSRCDIR.GeoIP?=	../../net/GeoIP
 .endif	# GEOIP_BUILDLINK3_MK
 
Index: ./net/ORBit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./net/ORBit/buildlink3.mk	5 Feb 2006 23:10:22 -0000	1.6
+++ ./net/ORBit/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ORBit
 
 .if !empty(ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
-BUILDLINK_RECOMMENDED.ORBit+=	ORBit>=0.5.17nb1
+BUILDLINK_API_DEPENDS.ORBit+=	ORBit>=0.5.15nb5
+BUILDLINK_ABI_DEPENDS.ORBit+=	ORBit>=0.5.17nb1
 BUILDLINK_PKGSRCDIR.ORBit?=	../../net/ORBit
 .endif	# ORBIT_BUILDLINK3_MK
 
Index: ./net/ORBit2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit2/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./net/ORBit2/buildlink3.mk	5 Feb 2006 23:10:22 -0000	1.9
+++ ./net/ORBit2/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ORBit2
 
 .if !empty(ORBIT2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ORBit2+=	ORBit2>=2.12.0
-BUILDLINK_RECOMMENDED.ORBit2?=	ORBit2>=2.12.4nb1
+BUILDLINK_API_DEPENDS.ORBit2+=	ORBit2>=2.12.0
+BUILDLINK_ABI_DEPENDS.ORBit2?=	ORBit2>=2.12.4nb1
 BUILDLINK_PKGSRCDIR.ORBit2?=	../../net/ORBit2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/orbit-2.0$$/ \
Index: ./net/SDL_net/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/SDL_net/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/SDL_net/buildlink3.mk	5 Feb 2006 23:10:22 -0000	1.5
+++ ./net/SDL_net/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	SDL_net
 
 .if !empty(SDL_NET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
-BUILDLINK_RECOMMENDED.SDL_net+=	SDL_net>=1.2.5nb5
+BUILDLINK_API_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb1
+BUILDLINK_ABI_DEPENDS.SDL_net+=	SDL_net>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.SDL_net?=	../../net/SDL_net
 .endif	# SDL_NET_BUILDLINK3_MK
 
Index: ./net/adns/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/adns/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/adns/buildlink3.mk	5 Feb 2006 23:10:22 -0000	1.3
+++ ./net/adns/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	adns
 
 .if !empty(ADNS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.adns+=	adns>=1.0
-BUILDLINK_RECOMMENDED.adns+=	adns>=1.1nb2
+BUILDLINK_API_DEPENDS.adns+=	adns>=1.0
+BUILDLINK_ABI_DEPENDS.adns+=	adns>=1.1nb2
 BUILDLINK_PKGSRCDIR.adns?=	../../net/adns
 .endif	# ADNS_BUILDLINK3_MK
 
Index: ./net/bind9/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/bind9/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./net/bind9/buildlink3.mk	3 Oct 2004 00:17:49 -0000	1.7
+++ ./net/bind9/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	bind
 
 .if !empty(BIND_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bind+=	bind>=9.2.2
-BUILDLINK_RECOMMENDED.bind+=	bind>=9.2.3nb5
+BUILDLINK_API_DEPENDS.bind+=	bind>=9.2.2
+BUILDLINK_ABI_DEPENDS.bind+=	bind>=9.2.3nb5
 BUILDLINK_PKGSRCDIR.bind?=	../../net/bind9
 
 BUILDLINK_INCDIRS.bind?=	include/bind
Index: ./net/bind9/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/bind9/builtin.mk,v
retrieving revision 1.9
diff -u -r1.9 builtin.mk
--- ./net/bind9/builtin.mk	26 Jun 2005 04:05:41 -0000	1.9
+++ ./net/bind9/builtin.mk	4 Apr 2006 06:26:55 -0000
@@ -58,7 +58,7 @@
 .    if defined(BUILTIN_PKG.bind) && \
         !empty(IS_BUILTIN.bind:M[yY][eE][sS])
 USE_BUILTIN.bind=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.bind}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.bind}
 .        if !empty(USE_BUILTIN.bind:M[yY][eE][sS])
 USE_BUILTIN.bind!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bind:Q}; then	\
Index: ./net/boinc3-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/boinc3-libs/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./net/boinc3-libs/buildlink3.mk	19 Jul 2004 20:11:04 -0000	1.1.1.1
+++ ./net/boinc3-libs/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	boinclibs
 
 .if !empty(BOINC_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
+BUILDLINK_API_DEPENDS.boinclibs+=	boinc3-libs>=3.19.20040714
 BUILDLINK_PKGSRCDIR.boinclibs?=	../../net/boinc3-libs
 
 # installs static libraries only
Index: ./net/btpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/btpd/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./net/btpd/Makefile	22 Feb 2006 22:09:44 -0000	1.2
+++ ./net/btpd/Makefile	4 Apr 2006 06:26:55 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=	http://www.murmeldjur.se/btpd/
 COMMENT=	Daemon for file sharing over bittorrent
 
-BUILDLINK_DEPENDS.libevent+=	libevent>=0.9
+BUILDLINK_API_DEPENDS.libevent+=	libevent>=0.9
 
 GNU_CONFIGURE=	YES
 
Index: ./net/cdpd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/cdpd/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./net/cdpd/Makefile	17 Jun 2005 03:50:24 -0000	1.11
+++ ./net/cdpd/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 
 GNU_CONFIGURE=	YES
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 INSTALLATION_DIRS=	man/man8 sbin
 
Index: ./net/dante/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/dante/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/dante/buildlink3.mk	3 Oct 2004 00:17:49 -0000	1.2
+++ ./net/dante/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	dante
 
 .if !empty(DANTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dante+=	dante>=1.1.13
-BUILDLINK_RECOMMENDED.dante+=	dante>=1.1.14nb1
+BUILDLINK_API_DEPENDS.dante+=	dante>=1.1.13
+BUILDLINK_ABI_DEPENDS.dante+=	dante>=1.1.14nb1
 BUILDLINK_PKGSRCDIR.dante?=	../../net/dante
 .endif	# DANTE_BUILDLINK3_MK
 
Index: ./net/ettercap-NG/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ettercap-NG/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./net/ettercap-NG/Makefile	29 Dec 2005 06:21:58 -0000	1.5
+++ ./net/ettercap-NG/Makefile	4 Apr 2006 06:26:55 -0000
@@ -10,7 +10,7 @@
 
 CONFLICTS=	ettercap-[0-9]*
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.1
 
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
Index: ./net/firewalk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/firewalk/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./net/firewalk/Makefile	4 Mar 2006 21:30:18 -0000	1.15
+++ ./net/firewalk/Makefile	4 Apr 2006 06:26:55 -0000
@@ -14,7 +14,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.1.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.1.*
 
 MAKE_ENV+=	FIREWALK_LOC=${PREFIX:Q}
 
Index: ./net/flodo/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/flodo/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./net/flodo/Makefile	4 Mar 2006 21:30:18 -0000	1.8
+++ ./net/flodo/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 HOMEPAGE=		http://arctic.org/~dean/flodo/
 COMMENT=		Simple network flow sampling tool
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libpcap}/include
 LDFLAGS+=		-L${BUILDLINK_PREFIX.libpcap}/lib
Index: ./net/freeradius/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/freeradius/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- ./net/freeradius/Makefile	22 Mar 2006 20:53:41 -0000	1.46
+++ ./net/freeradius/Makefile	4 Apr 2006 06:26:55 -0000
@@ -20,7 +20,7 @@
 FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP:Q}
 USE_OLD_DES_API=	YES
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE+=	libtool
Index: ./net/freewais-sf/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/freewais-sf/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/freewais-sf/buildlink3.mk	3 Oct 2004 00:17:51 -0000	1.2
+++ ./net/freewais-sf/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	freewais-sf
 
 .if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
-BUILDLINK_RECOMMENDED.freewais-sf+=	freewais-sf>=2.2.12nb2
+BUILDLINK_API_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
+BUILDLINK_ABI_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.freewais-sf?=	../../net/freewais-sf
 .endif	# FREEWAIS_SF_BUILDLINK3_MK
 
Index: ./net/gift/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/gift/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/gift/buildlink3.mk	15 Oct 2004 12:14:07 -0000	1.3
+++ ./net/gift/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gift
 
 .if !empty(GIFT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gift+=	gift>=0.11.6
-BUILDLINK_RECOMMENDED.gift+=	gift>=0.11.6nb2
+BUILDLINK_API_DEPENDS.gift+=	gift>=0.11.6
+BUILDLINK_ABI_DEPENDS.gift+=	gift>=0.11.6nb2
 BUILDLINK_PKGSRCDIR.gift?=	../../net/gift
 .endif	# GIFT_BUILDLINK3_MK
 
Index: ./net/gnet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/gnet/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/gnet/buildlink3.mk	5 Feb 2006 23:10:24 -0000	1.5
+++ ./net/gnet/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnet
 
 .if !empty(GNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet+=	gnet>=2.0.3nb1
-BUILDLINK_RECOMMENDED.gnet+=	gnet>=2.0.7nb2
+BUILDLINK_API_DEPENDS.gnet+=	gnet>=2.0.3nb1
+BUILDLINK_ABI_DEPENDS.gnet+=	gnet>=2.0.7nb2
 BUILDLINK_PKGSRCDIR.gnet?=	../../net/gnet
 .endif	# GNET_BUILDLINK3_MK
 
Index: ./net/gnet1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/gnet1/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/gnet1/buildlink3.mk	5 Feb 2006 23:10:25 -0000	1.5
+++ ./net/gnet1/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnet1
 
 .if !empty(GNET1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
-BUILDLINK_RECOMMENDED.gnet1+=	gnet1>=1.1.8nb4
+BUILDLINK_API_DEPENDS.gnet1+=	gnet1>=1.1.8nb2
+BUILDLINK_ABI_DEPENDS.gnet1+=	gnet1>=1.1.8nb4
 BUILDLINK_PKGSRCDIR.gnet1?=	../../net/gnet1
 .endif	# GNET1_BUILDLINK3_MK
 
Index: ./net/hesiod/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/hesiod/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/hesiod/buildlink3.mk	25 Apr 2004 00:34:21 -0000	1.3
+++ ./net/hesiod/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	hesiod
 
 .if !empty(HESIOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hesiod+=	hesiod>=3.0.2
+BUILDLINK_API_DEPENDS.hesiod+=	hesiod>=3.0.2
 BUILDLINK_PKGSRCDIR.hesiod?=	../../net/hesiod
 BUILDLINK_DEPMETHOD.hesiod?=	build
 .endif	# HESIOD_BUILDLINK3_MK
Index: ./net/howl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/howl/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/howl/buildlink3.mk	12 Feb 2006 05:26:39 -0000	1.3
+++ ./net/howl/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=		howl
 
 .if !empty(HOWL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.howl+=	howl>=0.9.5
-BUILDLINK_RECOMMENDED.howl+=	howl>=0.9.5nb1
+BUILDLINK_API_DEPENDS.howl+=	howl>=0.9.5
+BUILDLINK_ABI_DEPENDS.howl+=	howl>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.howl?=	../../net/howl
 .endif	# HOWL_BUILDLINK3_MK
 
Index: ./net/kdenetwork3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/kdenetwork3/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./net/kdenetwork3/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.7
+++ ./net/kdenetwork3/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdenetwork
 
 .if !empty(KDENETWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
-BUILDLINK_RECOMMENDED.kdenetwork?=	kdenetwork>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
+BUILDLINK_ABI_DEPENDS.kdenetwork?=	kdenetwork>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
 .endif	# KDENETWORK_BUILDLINK3_MK
 
Index: ./net/libIDL/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libIDL/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./net/libIDL/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.8
+++ ./net/libIDL/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libIDL
 
 .if !empty(LIBIDL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
-BUILDLINK_RECOMMENDED.libIDL+=	libIDL>=0.8.6nb1
+BUILDLINK_API_DEPENDS.libIDL+=	libIDL>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.libIDL+=	libIDL>=0.8.6nb1
 BUILDLINK_PKGSRCDIR.libIDL?=	../../net/libIDL
 .endif	# LIBIDL_BUILDLINK3_MK
 
Index: ./net/libares/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libares/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/libares/buildlink3.mk	12 Mar 2005 05:42:48 -0000	1.3
+++ ./net/libares/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(LIBARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libares+=	libares>=1.1.1
+BUILDLINK_API_DEPENDS.libares+=	libares>=1.1.1
 BUILDLINK_PKGSRCDIR.libares?=	../../net/libares
 BUILDLINK_DEPMETHOD.libares?=	build
 .endif	# LIBARES_BUILDLINK3_MK
Index: ./net/libcares/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libcares/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./net/libcares/buildlink3.mk	1 Dec 2005 17:27:10 -0000	1.1.1.1
+++ ./net/libcares/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libcares
 
 .if !empty(LIBCARES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcares+=	libcares>=1.3.0
+BUILDLINK_API_DEPENDS.libcares+=	libcares>=1.3.0
 BUILDLINK_PKGSRCDIR.libcares?=	../../net/libcares
 .endif	# LIBCARES_BUILDLINK3_MK
 
Index: ./net/libdnet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libdnet/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/libdnet/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.2
+++ ./net/libdnet/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libdnet
 
 .if !empty(LIBDNET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdnet+=	libdnet>=1.7
-BUILDLINK_RECOMMENDED.libdnet?=	libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.libdnet+=	libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.libdnet?=	libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.libdnet?=	../../net/libdnet
 .endif	# LIBDNET_BUILDLINK3_MK
 
Index: ./net/liblive/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/liblive/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/liblive/buildlink3.mk	3 Oct 2004 00:17:54 -0000	1.2
+++ ./net/liblive/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	liblive
 
 .if !empty(LIBLIVE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.liblive+=	liblive>=2003.04.04
-BUILDLINK_RECOMMENDED.liblive+=	liblive>=2003.04.04nb1
+BUILDLINK_API_DEPENDS.liblive+=	liblive>=2003.04.04
+BUILDLINK_ABI_DEPENDS.liblive+=	liblive>=2003.04.04nb1
 BUILDLINK_PKGSRCDIR.liblive?=	../../net/liblive
 .endif	# LIBLIVE_BUILDLINK3_MK
 
Index: ./net/libnids/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libnids/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./net/libnids/buildlink3.mk	25 Apr 2004 04:25:11 -0000	1.1
+++ ./net/libnids/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libnids
 
 .if !empty(LIBNIDS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnids+=	libnids>=1.18
+BUILDLINK_API_DEPENDS.libnids+=	libnids>=1.18
 BUILDLINK_PKGSRCDIR.libnids?=	../../net/libnids
 BUILDLINK_DEPMETHOD.libnids?=	build
 .endif	# LIBNIDS_BUILDLINK3_MK
Index: ./net/libpcap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libpcap/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./net/libpcap/buildlink3.mk	12 Jan 2005 15:44:12 -0000	1.16
+++ ./net/libpcap/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -14,7 +14,7 @@
 
 .if !empty(LIBPCAP_BUILDLINK3_MK:M+)
 # XXX?
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.5.0
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.5.0
 BUILDLINK_PKGSRCDIR.libpcap?=	../../net/libpcap
 
 # on Solaris, we always need libnsl and libsocket because libpcap.a
Index: ./net/libpcap/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libpcap/builtin.mk,v
retrieving revision 1.12
diff -u -r1.12 builtin.mk
--- ./net/libpcap/builtin.mk	27 Feb 2006 14:20:47 -0000	1.12
+++ ./net/libpcap/builtin.mk	4 Apr 2006 06:26:55 -0000
@@ -82,7 +82,7 @@
 .    if defined(BUILTIN_PKG.libpcap) && \
         !empty(IS_BUILTIN.libpcap:M[yY][eE][sS])
 USE_BUILTIN.libpcap=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libpcap}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libpcap}
 .        if !empty(USE_BUILTIN.libpcap:M[yY][eE][sS])
 USE_BUILTIN.libpcap!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libpcap:Q}; then \
Index: ./net/libradius/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libradius/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./net/libradius/buildlink3.mk	11 Nov 2004 11:57:47 -0000	1.4
+++ ./net/libradius/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	libradius
 
 .if !empty(LIBRADIUS_LINUX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libradius+=	libradius>=20040827
+BUILDLINK_API_DEPENDS.libradius+=	libradius>=20040827
 BUILDLINK_PKGSRCDIR.libradius?=	../../net/libradius
 BUILDLINK_DEPMETHOD.libradius?=	build
 
Index: ./net/libsoup/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libsoup/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./net/libsoup/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.9
+++ ./net/libsoup/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsoup
 
 .if !empty(LIBSOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
-BUILDLINK_RECOMMENDED.libsoup?=	libsoup>=1.99.28nb4
+BUILDLINK_API_DEPENDS.libsoup+=	libsoup>=1.99.28nb3
+BUILDLINK_ABI_DEPENDS.libsoup?=	libsoup>=1.99.28nb4
 BUILDLINK_PKGSRCDIR.libsoup?=	../../net/libsoup
 .endif	# LIBSOUP_BUILDLINK3_MK
 
Index: ./net/libsoup-devel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libsoup-devel/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/libsoup-devel/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.5
+++ ./net/libsoup-devel/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libsoup-devel
 
 .if !empty(LIBSOUP_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.0
-BUILDLINK_RECOMMENDED.libsoup-devel?=	libsoup-devel>=2.2.7nb1
+BUILDLINK_API_DEPENDS.libsoup-devel+=	libsoup-devel>=2.2.0
+BUILDLINK_ABI_DEPENDS.libsoup-devel?=	libsoup-devel>=2.2.7nb1
 BUILDLINK_PKGSRCDIR.libsoup-devel?=	../../net/libsoup-devel
 .endif	# LIBSOUP_DEVEL_BUILDLINK3_MK
 
Index: ./net/libtorrent/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/libtorrent/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./net/libtorrent/buildlink3.mk	3 Mar 2006 15:30:53 -0000	1.6
+++ ./net/libtorrent/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtorrent
 
 .if !empty(LIBTORRENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtorrent+=		libtorrent>=0.8.0
-BUILDLINK_RECOMMENDED.libtorrent+=	libtorrent>=0.8.5nb1
+BUILDLINK_API_DEPENDS.libtorrent+=		libtorrent>=0.8.0
+BUILDLINK_ABI_DEPENDS.libtorrent+=	libtorrent>=0.8.5nb1
 BUILDLINK_PKGSRCDIR.libtorrent?=	../../net/libtorrent
 .endif	# LIBTORRENT_BUILDLINK3_MK
 
Index: ./net/linc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/linc/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/linc/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.3
+++ ./net/linc/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	linc
 
 .if !empty(LINC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linc+=	linc>=1.1.1
-BUILDLINK_RECOMMENDED.linc+=	linc>=1.1.1nb3
+BUILDLINK_API_DEPENDS.linc+=	linc>=1.1.1
+BUILDLINK_ABI_DEPENDS.linc+=	linc>=1.1.1nb3
 BUILDLINK_PKGSRCDIR.linc?=	../../net/linc
 .endif	# LINC_BUILDLINK3_MK
 
Index: ./net/mDNSResponder/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/mDNSResponder/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/mDNSResponder/buildlink3.mk	5 Feb 2006 23:10:26 -0000	1.2
+++ ./net/mDNSResponder/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mDNSResponder
 
 .if !empty(MDNSRESPONDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mDNSResponder+=	mDNSResponder>=98
-BUILDLINK_RECOMMENDED.mDNSResponder?=	mDNSResponder>=107.5nb1
+BUILDLINK_API_DEPENDS.mDNSResponder+=	mDNSResponder>=98
+BUILDLINK_ABI_DEPENDS.mDNSResponder?=	mDNSResponder>=107.5nb1
 BUILDLINK_PKGSRCDIR.mDNSResponder?=	../../net/mDNSResponder
 .endif	# MDNSRESPONDER_BUILDLINK3_MK
 
Index: ./net/mldonkey-gui/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/mldonkey-gui/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- ./net/mldonkey-gui/options.mk	1 Nov 2005 21:48:22 -0000	1.4
+++ ./net/mldonkey-gui/options.mk	4 Apr 2006 06:26:55 -0000
@@ -17,6 +17,6 @@
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 # 2.6.0 is the first ~stable version (for mldonkey)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
+BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0
 .include "../../x11/lablgtk2/buildlink3.mk"
 .endif
Index: ./net/nemesis/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nemesis/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./net/nemesis/Makefile	4 Mar 2006 21:30:21 -0000	1.14
+++ ./net/nemesis/Makefile	4 Apr 2006 06:26:55 -0000
@@ -10,7 +10,7 @@
 
 GNU_CONFIGURE=  yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.2a
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.2a
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libnet/buildlink3.mk"
Index: ./net/net-snmp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/net-snmp/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./net/net-snmp/buildlink3.mk	24 Jan 2006 22:16:55 -0000	1.7
+++ ./net/net-snmp/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	net-snmp
 
 .if !empty(NET_SNMP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
-BUILDLINK_RECOMMENDED.net-snmp+=	net-snmp>=5.2.1.2
+BUILDLINK_API_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
+BUILDLINK_ABI_DEPENDS.net-snmp+=	net-snmp>=5.2.1.2
 BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
 .endif	# NET_SNMP_BUILDLINK3_MK
 
Index: ./net/netatalk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/netatalk/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./net/netatalk/buildlink3.mk	5 Feb 2006 23:10:27 -0000	1.8
+++ ./net/netatalk/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
-BUILDLINK_RECOMMENDED.netatalk?=	netatalk>=2.0.3nb3
+BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
+BUILDLINK_ABI_DEPENDS.netatalk?=	netatalk>=2.0.3nb3
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
 BUILDLINK_DEPMETHOD.netatalk?=	build
 .endif	# NETATALK_BUILDLINK3_MK
Index: ./net/netatalk1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/netatalk1/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/netatalk1/buildlink3.mk	5 Feb 2006 23:10:27 -0000	1.2
+++ ./net/netatalk1/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=1.6.2
-BUILDLINK_RECOMMENDED.netatalk+=	netatalk>=1.6.4anb1
+BUILDLINK_API_DEPENDS.netatalk+=	netatalk>=1.6.2
+BUILDLINK_ABI_DEPENDS.netatalk+=	netatalk>=1.6.4anb1
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk1
 .endif	# NETATALK_BUILDLINK3_MK
 
Index: ./net/netbsd-tap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/netbsd-tap/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/netbsd-tap/buildlink3.mk	20 Feb 2005 21:50:57 -0000	1.2
+++ ./net/netbsd-tap/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	netbsd-tap
 
 .if !empty(NETBSD_TAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netbsd-tap+=	netbsd-tap>=20050120
+BUILDLINK_API_DEPENDS.netbsd-tap+=	netbsd-tap>=20050120
 BUILDLINK_PKGSRCDIR.netbsd-tap?=	../../net/netbsd-tap
 .endif	# NETBSD_TAP_BUILDLINK3_MK
 
Index: ./net/netbsd-tap/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/netbsd-tap/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./net/netbsd-tap/builtin.mk	1 Jun 2005 18:03:08 -0000	1.2
+++ ./net/netbsd-tap/builtin.mk	4 Apr 2006 06:26:55 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.netbsd-tap) && \
         !empty(IS_BUILTIN.netbsd-tap:M[yY][eE][sS])
 USE_BUILTIN.netbsd-tap=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.netbsd-tap}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.netbsd-tap}
 .        if !empty(USE_BUILTIN.netbsd-tap:M[yY][eE][sS])
 USE_BUILTIN.netbsd-tap!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.netbsd-tap:Q}; then \
Index: ./net/ns/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ns/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./net/ns/Makefile	23 Feb 2006 23:37:47 -0000	1.24
+++ ./net/ns/Makefile	4 Apr 2006 06:26:55 -0000
@@ -12,8 +12,8 @@
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILDLINK_DEPENDS.tcl+=	tcl>=8.4.12nb1
-BUILDLINK_DEPENDS.tk+=	tk>=8.4.12nb2
+BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.12nb2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LANGUAGES=	c c++
Index: ./net/nsd/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/nsd/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./net/nsd/Makefile	29 Dec 2005 06:22:00 -0000	1.34
+++ ./net/nsd/Makefile	4 Apr 2006 06:26:55 -0000
@@ -9,7 +9,7 @@
 COMMENT=	Authoritative-only DNS server
 
 BUILD_DEFS+=	USE_INET6
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 .include "../../mk/bsd.prefs.mk"
 
Index: ./net/ntop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ntop/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- ./net/ntop/Makefile	5 Feb 2006 23:10:28 -0000	1.43
+++ ./net/ntop/Makefile	4 Apr 2006 06:26:55 -0000
@@ -29,7 +29,7 @@
 # ntop-3.x crashes with IPv6
 CONFIGURE_ARGS+=	--disable-ipv6
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.3
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
Index: ./net/openh323/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/openh323/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/openh323/buildlink3.mk	5 Feb 2006 23:10:28 -0000	1.3
+++ ./net/openh323/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openh323
 
 .if !empty(OPENH323_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openh323+=	openh323>=1.15.1
-BUILDLINK_RECOMMENDED.openh323+=	openh323>=1.15.2nb1
+BUILDLINK_API_DEPENDS.openh323+=	openh323>=1.15.1
+BUILDLINK_ABI_DEPENDS.openh323+=	openh323>=1.15.2nb1
 BUILDLINK_PKGSRCDIR.openh323?=	../../net/openh323
 .endif	# OPENH323_BUILDLINK3_MK
 
Index: ./net/openslp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/openslp/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./net/openslp/buildlink3.mk	26 May 2005 20:14:21 -0000	1.8
+++ ./net/openslp/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openslp
 
 .if !empty(OPENSLP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openslp+=	openslp>=1.0.1
-BUILDLINK_RECOMMENDED.openslp+=	openslp>=1.2.1
+BUILDLINK_API_DEPENDS.openslp+=	openslp>=1.0.1
+BUILDLINK_ABI_DEPENDS.openslp+=	openslp>=1.2.1
 BUILDLINK_PKGSRCDIR.openslp?=	../../net/openslp
 .endif	# OPENSLP_BUILDLINK3_MK
 
Index: ./net/p5-Net-Packet/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/p5-Net-Packet/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./net/p5-Net-Packet/Makefile	5 Nov 2005 19:37:54 -0000	1.2
+++ ./net/p5-Net-Packet/Makefile	4 Apr 2006 06:26:55 -0000
@@ -16,7 +16,7 @@
 DEPENDS+=	p5-Class-Gomor-Hash-[0-9]*:../../devel/p5-Class-Gomor-Hash
 
 PKG_INSTALLATION_TYPES=		overwrite pkgviews
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.9.3nb2
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9.3nb2
 
 PERL5_PACKLIST=		auto/Net/Packet/.packlist
 
Index: ./net/p5-Net-Pcap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/p5-Net-Pcap/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./net/p5-Net-Pcap/Makefile	26 Jan 2006 02:00:16 -0000	1.9
+++ ./net/p5-Net-Pcap/Makefile	4 Apr 2006 06:26:55 -0000
@@ -10,7 +10,7 @@
 HOMEPAGE=	http://search.cpan.org/dist/Net-Pcap/
 COMMENT=	Perl interface to pcap(3) LBL packet capture library
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.1
 
 PERL5_PACKLIST=	auto/Net/Pcap/.packlist
 
Index: ./net/py-ORBit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-ORBit/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./net/py-ORBit/Makefile	5 Feb 2006 23:10:30 -0000	1.22
+++ ./net/py-ORBit/Makefile	4 Apr 2006 06:26:55 -0000
@@ -20,7 +20,7 @@
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
-BUILDLINK_DEPENDS.python22+=	python22>=2.2.2nb2
+BUILDLINK_API_DEPENDS.python22+=	python22>=2.2.2nb2
 
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
Index: ./net/py-ORBit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-ORBit/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./net/py-ORBit/buildlink3.mk	5 Feb 2006 23:10:30 -0000	1.9
+++ ./net/py-ORBit/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyorbit
 
 .if !empty(PY_ORBIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
-BUILDLINK_RECOMMENDED.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
+BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.0nb1
+BUILDLINK_ABI_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=	../../net/py-ORBit
 .endif	# PY_ORBIT_BUILDLINK3_MK
 
Index: ./net/py-libdnet/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-libdnet/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/py-libdnet/buildlink3.mk	5 Feb 2006 23:10:30 -0000	1.2
+++ ./net/py-libdnet/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -14,8 +14,8 @@
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pylibdnet+=	${PYPKGPREFIX}-libdnet>=1.7
-BUILDLINK_RECOMMENDED.pylibdnet?=	${PYPKGPREFIX}-libdnet>=1.10nb1
+BUILDLINK_API_DEPENDS.pylibdnet+=	${PYPKGPREFIX}-libdnet>=1.7
+BUILDLINK_ABI_DEPENDS.pylibdnet?=	${PYPKGPREFIX}-libdnet>=1.10nb1
 BUILDLINK_PKGSRCDIR.pylibdnet?=	../../net/py-libdnet
 .endif	# PYLIBDNET_BUILDLINK3_MK
 
Index: ./net/py-libpcap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-libpcap/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./net/py-libpcap/Makefile	4 Mar 2006 21:30:23 -0000	1.6
+++ ./net/py-libpcap/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 COMMENT=		Python wrapper for libpcap
 
 PYDISTUTILSPKG=		yes
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.9.3nb1
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9.3nb1
 
 pre-build:
 	(cd ${WRKSRC} && ${PYTHONBIN} mk-constants.py)
Index: ./net/py-libpcap/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-libpcap/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/py-libpcap/buildlink3.mk	5 Feb 2006 23:10:30 -0000	1.2
+++ ./net/py-libpcap/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -14,8 +14,8 @@
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pylibpcap+=	${PYPKGPREFIX}-libpcap>=0.5.0
-BUILDLINK_RECOMMENDED.pylibpcap?=	${PYPKGPREFIX}-libpcap>=0.5nb1
+BUILDLINK_API_DEPENDS.pylibpcap+=	${PYPKGPREFIX}-libpcap>=0.5.0
+BUILDLINK_ABI_DEPENDS.pylibpcap?=	${PYPKGPREFIX}-libpcap>=0.5nb1
 BUILDLINK_PKGSRCDIR.pylibpcap?=	../../net/py-libpcap
 
 .endif	# PYLIBPCAP_BUILDLINK3_MK
Index: ./net/py-soappy/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/py-soappy/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/py-soappy/buildlink3.mk	5 Feb 2006 23:10:30 -0000	1.3
+++ ./net/py-soappy/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	py-SOAPpy
 
 .if !empty(PY_SOAPPY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
-BUILDLINK_RECOMMENDED.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
+BUILDLINK_API_DEPENDS.py-SOAPpy+=	${PYPKGPREFIX}-SOAPpy>=0.11.4
+BUILDLINK_ABI_DEPENDS.py-SOAPpy?=	${PYPKGPREFIX}-SOAPpy>=0.11.4nb4
 BUILDLINK_PKGSRCDIR.py-SOAPpy?=	../../net/py-soappy
 .endif	# PY_SOAPPY_BUILDLINK3_MK
 
Index: ./net/samba/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/samba/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/samba/buildlink3.mk	14 Sep 2004 17:18:06 -0000	1.2
+++ ./net/samba/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	samba
 
 .if !empty(SAMBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.samba+=	samba>=3.0.7
+BUILDLINK_API_DEPENDS.samba+=	samba>=3.0.7
 BUILDLINK_PKGSRCDIR.samba?=	../../net/samba
 .endif	# SAMBA_BUILDLINK3_MK
 
Index: ./net/scdp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/scdp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./net/scdp/Makefile	11 Apr 2005 21:46:59 -0000	1.5
+++ ./net/scdp/Makefile	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./net/scli/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/scli/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./net/scli/Makefile	4 Mar 2006 21:30:24 -0000	1.18
+++ ./net/scli/Makefile	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 GNU_CONFIGURE=		yes
 
 USE_GNU_READLINE=	# history_list
-BUILDLINK_DEPENDS.readline?=    readline>=4.0
+BUILDLINK_API_DEPENDS.readline?=    readline>=4.0
 
 INFO_FILES=		scli.info
 
Index: ./net/socks4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/socks4/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/socks4/buildlink3.mk	5 Mar 2004 19:25:38 -0000	1.5
+++ ./net/socks4/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	socks4
 
 .if !empty(SOCKS4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks4+=	socks4>=2.2
+BUILDLINK_API_DEPENDS.socks4+=	socks4>=2.2
 BUILDLINK_PKGSRCDIR.socks4?=	../../net/socks4
 
 BUILDLINK_TRANSFORM+=	l:socks:socks4
Index: ./net/socks5/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/socks5/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./net/socks5/buildlink3.mk	5 Mar 2004 19:25:39 -0000	1.5
+++ ./net/socks5/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	socks5
 
 .if !empty(SOCKS5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.socks5+=	socks5>=1.0.2
+BUILDLINK_API_DEPENDS.socks5+=	socks5>=1.0.2
 BUILDLINK_PKGSRCDIR.socks5?=	../../net/socks5
 .endif	# SOCKS5_BUILDLINK3_MK
 
Index: ./net/soup/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/soup/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./net/soup/buildlink3.mk	5 Feb 2006 23:10:31 -0000	1.4
+++ ./net/soup/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	soup
 
 .if !empty(SOUP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.soup?=                soup>=0.7.11nb3
-BUILDLINK_RECOMMENDED.soup?=	soup>=0.7.11nb5
+BUILDLINK_API_DEPENDS.soup?=                soup>=0.7.11nb3
+BUILDLINK_ABI_DEPENDS.soup?=	soup>=0.7.11nb5
 BUILDLINK_PKGSRCDIR.soup?=	../../net/soup
 .endif	# SOUP_BUILDLINK3_MK
 
Index: ./net/spread/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/spread/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./net/spread/buildlink3.mk	5 Mar 2004 19:25:39 -0000	1.3
+++ ./net/spread/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	spread
 
 .if !empty(SPREAD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.spread+=	spread>=3.17.1
+BUILDLINK_API_DEPENDS.spread+=	spread>=3.17.1
 BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
 .endif	# SPREAD_BUILDLINK3_MK
 
Index: ./net/tcl-scotty/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcl-scotty/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./net/tcl-scotty/Makefile	11 Apr 2005 21:47:00 -0000	1.18
+++ ./net/tcl-scotty/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 HOMEPAGE=	http://wwwhome.cs.utwente.nl/~schoenw/scotty/
 COMMENT=	Network management extensions to TCL
 
-BUILDLINK_DEPENDS.tcl+=	tcl>=8.4.6nb4
+BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.6nb4
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
Index: ./net/tcl-scotty/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcl-scotty/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./net/tcl-scotty/buildlink3.mk	3 Oct 2004 00:18:00 -0000	1.2
+++ ./net/tcl-scotty/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcl-scotty
 
 .if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
-BUILDLINK_RECOMMENDED.tcl-scotty+=	tcl-scotty>=2.1.11nb4
+BUILDLINK_API_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
+BUILDLINK_ABI_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11nb4
 BUILDLINK_PKGSRCDIR.tcl-scotty?=	../../net/tcl-scotty
 .endif	# TCL_SCOTTY_BUILDLINK3_MK
 
Index: ./net/tcpdump/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcpdump/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./net/tcpdump/Makefile	4 Mar 2006 21:30:24 -0000	1.21
+++ ./net/tcpdump/Makefile	4 Apr 2006 06:26:55 -0000
@@ -13,7 +13,7 @@
 .include "options.mk"
 
 # not strictly needed
-BUILDLINK_DEPENDS.libpcap+= libpcap>=0.9.3
+BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
Index: ./net/tcpreplay/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcpreplay/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./net/tcpreplay/Makefile	4 Mar 2006 21:30:25 -0000	1.14
+++ ./net/tcpreplay/Makefile	4 Apr 2006 06:26:55 -0000
@@ -8,7 +8,7 @@
 HOMEPAGE=	http://tcpreplay.sourceforge.net/
 COMMENT=	Replay saved tcpdump or snoop files
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
 
 GNU_CONFIGURE=	yes
 
Index: ./net/tcptraceroute/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcptraceroute/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./net/tcptraceroute/Makefile	17 Jun 2005 03:50:28 -0000	1.10
+++ ./net/tcptraceroute/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 COMMENT=		Traceroute implementation using TCP packets
 
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 BUILD_TARGET=		tcptraceroute
 
Index: ./net/tor/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tor/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./net/tor/Makefile	14 Mar 2006 01:14:31 -0000	1.26
+++ ./net/tor/Makefile	4 Apr 2006 06:26:55 -0000
@@ -60,7 +60,7 @@
 	${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/tor.pkgsrc.rc ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/tor
 
-BUILDLINK_DEPENDS.libevent+= libevent>=1.1a
+BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1a
 # XXX the pkgsrc libevent builtin.mk does not detect the version of a builtin
 # libevent, so we need to force use of the pkgsrc one
 USE_BUILTIN.libevent=	no
Index: ./net/trafshow/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/trafshow/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ./net/trafshow/Makefile	4 Mar 2006 21:30:25 -0000	1.25
+++ ./net/trafshow/Makefile	4 Apr 2006 06:26:55 -0000
@@ -29,7 +29,7 @@
 	${INSTALL_DATA} ${WRKSRC}/.trafshow \
 		${PREFIX}/share/examples/trafshow/trafshow
 
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.7
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.7
 .include "../../net/libpcap/buildlink3.mk"
 
 .include "../../mk/curses.buildlink3.mk"
Index: ./net/ucarp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ucarp/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./net/ucarp/Makefile	5 Feb 2006 23:10:32 -0000	1.7
+++ ./net/ucarp/Makefile	4 Apr 2006 06:26:55 -0000
@@ -15,7 +15,7 @@
 GNU_CONFIGURE=		YES
 
 # pcap_freecode with one argument only
-BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.6.0
+BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6.0
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucarp
Index: ./net/unison/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- ./net/unison/Makefile	5 Feb 2006 23:10:32 -0000	1.31
+++ ./net/unison/Makefile	4 Apr 2006 06:26:55 -0000
@@ -12,7 +12,7 @@
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
Index: ./net/unison-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/unison-devel/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./net/unison-devel/Makefile	5 Feb 2006 23:10:32 -0000	1.14
+++ ./net/unison-devel/Makefile	4 Apr 2006 06:26:55 -0000
@@ -12,7 +12,7 @@
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.08.2
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
Index: ./net/whoson/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/whoson/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./net/whoson/buildlink3.mk	11 Oct 2004 16:51:54 -0000	1.1.1.1
+++ ./net/whoson/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	whoson
 
 .if !empty(WHOSON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.whoson+=	whoson>=2.03
+BUILDLINK_API_DEPENDS.whoson+=	whoson>=2.03
 BUILDLINK_PKGSRCDIR.whoson?=	../../net/whoson
 .endif	# WHOSON_BUILDLINK3_MK
 
Index: ./net/xfce4-wavelan-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/xfce4-wavelan-plugin/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./net/xfce4-wavelan-plugin/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.7
+++ ./net/xfce4-wavelan-plugin/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
 
 .if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
-BUILDLINK_RECOMMENDED.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.4.1nb3
+BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.4.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.4.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
 .endif	# XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
 
Index: ./net/xipdump/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/xipdump/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./net/xipdump/Makefile	5 Feb 2006 23:10:33 -0000	1.22
+++ ./net/xipdump/Makefile	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 HOMEPAGE=	http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump
 COMMENT=	Displays IP packets using X Window System
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
Index: ./net/yaz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/yaz/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./net/yaz/buildlink3.mk	5 Feb 2006 23:10:33 -0000	1.4
+++ ./net/yaz/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	yaz
 
 .if !empty(YAZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.yaz+=	yaz>=2.0
-BUILDLINK_RECOMMENDED.yaz+=	yaz>=2.1.6nb1
+BUILDLINK_API_DEPENDS.yaz+=	yaz>=2.0
+BUILDLINK_ABI_DEPENDS.yaz+=	yaz>=2.1.6nb1
 BUILDLINK_PKGSRCDIR.yaz?=	../../net/yaz
 .endif	# YAZ_BUILDLINK3_MK
 
Index: ./news/inn/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/news/inn/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./news/inn/buildlink3.mk	16 Mar 2004 09:48:37 -0000	1.1
+++ ./news/inn/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	inn
 
 .if !empty(INN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.inn+=	inn>=2.3.4
+BUILDLINK_API_DEPENDS.inn+=	inn>=2.3.4
 BUILDLINK_PKGSRCDIR.inn?=	../../news/inn
 
 .endif	# INN_BUILDLINK3_MK
Index: ./parallel/mpi-ch/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/mpi-ch/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./parallel/mpi-ch/buildlink3.mk	5 Feb 2006 23:10:34 -0000	1.5
+++ ./parallel/mpi-ch/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mpich
 
 .if !empty(MPICH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mpich+=	mpich>=1.2.6
-BUILDLINK_RECOMMENDED.mpich?=	mpich>=1.2.6nb3
+BUILDLINK_API_DEPENDS.mpich+=	mpich>=1.2.6
+BUILDLINK_ABI_DEPENDS.mpich?=	mpich>=1.2.6nb3
 BUILDLINK_PKGSRCDIR.mpich?=	../../parallel/mpi-ch
 BUILDLINK_DEPMETHOD.mpich?=	build
 .endif	# MPICH_BUILDLINK3_MK
Index: ./parallel/pvm3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/parallel/pvm3/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./parallel/pvm3/buildlink3.mk	5 Feb 2006 23:10:34 -0000	1.5
+++ ./parallel/pvm3/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pvm
 
 .if !empty(PVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pvm+=		pvm>=3.4.3
-BUILDLINK_RECOMMENDED.pvm+=	pvm>=3.4.5nb1
+BUILDLINK_API_DEPENDS.pvm+=		pvm>=3.4.3
+BUILDLINK_ABI_DEPENDS.pvm+=	pvm>=3.4.5nb1
 BUILDLINK_PKGSRCDIR.pvm?=	../../parallel/pvm3
 
 .  include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk"
Index: ./pkgtools/createbuildlink/files/createbuildlink
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/createbuildlink/files/createbuildlink,v
retrieving revision 1.29
diff -u -r1.29 createbuildlink
--- ./pkgtools/createbuildlink/files/createbuildlink	31 Jan 2006 03:35:35 -0000	1.29
+++ ./pkgtools/createbuildlink/files/createbuildlink	4 Apr 2006 06:26:55 -0000
@@ -155,7 +155,7 @@
 EOF
 
 sed -f $sedrules <<EOF
-BUILDLINK_DEPENDS.$PKGNOVER+=	$PKGNOVER>=$PKGVER
+BUILDLINK_API_DEPENDS.$PKGNOVER+=	$PKGNOVER>=$PKGVER
 EOF
 
 sed -f $sedrules <<EOF
Index: ./pkgtools/libnbcompat/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/libnbcompat/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./pkgtools/libnbcompat/buildlink3.mk	11 Sep 2004 19:05:16 -0000	1.12
+++ ./pkgtools/libnbcompat/buildlink3.mk	4 Apr 2006 06:26:55 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libnbcompat
 
 .if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnbcompat+=		libnbcompat>=20040911
+BUILDLINK_API_DEPENDS.libnbcompat+=		libnbcompat>=20040911
 BUILDLINK_PKGSRCDIR.libnbcompat?=	../../pkgtools/libnbcompat
 BUILDLINK_DEPMETHOD.libnbcompat?=	build
 BUILDLINK_LDADD.libnbcompat=		-lnbcompat
Index: ./pkgtools/pkg_install/files/add/perform.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/add/perform.c,v
retrieving revision 1.38
diff -u -r1.38 perform.c
--- ./pkgtools/pkg_install/files/add/perform.c	13 Mar 2006 22:08:22 -0000	1.38
+++ ./pkgtools/pkg_install/files/add/perform.c	4 Apr 2006 06:26:56 -0000
@@ -157,6 +157,8 @@
 			    buildinfo[BI_MACHINE_ARCH] = strdup(line);
 			else if (strcmp(key, "IGNORE_RECOMMENDED") == 0)
 			    buildinfo[BI_IGNORE_RECOMMENDED] = strdup(line);
+			else if (strcmp(key, "USE_ABI_DEPENDS") == 0)
+			    buildinfo[BI_USE_ABI_DEPENDS] = strdup(line);
 		}
 	}
 	(void) fclose(fp);
@@ -471,12 +473,15 @@
 		}
 	}
 
-	/* Check if IGNORE_RECOMMENDED was set when this package was built. */
+	/* Check if USE_ABI_DEPENDS or IGNORE_RECOMMENDED was set
+	 * when this package was built. IGNORE_RECOMMENDED is historical. */
 
-	if (buildinfo[BI_IGNORE_RECOMMENDED] != NULL &&
-	    strcasecmp(buildinfo[BI_IGNORE_RECOMMENDED], "NO") != 0) {
+	if ((buildinfo[BI_USE_ABI_DEPENDS] != NULL &&
+	    strcasecmp(buildinfo[BI_USE_ABI_DEPENDS], "YES") != 0) ||
+	    (buildinfo[BI_RECOMMENDED] != NULL &&
+	    strcasecmp(buildinfo[BI_IGNORE_RECOMMENDED], "NO") != 0)) {
 		warnx("%s was built", pkg);
-		warnx("\t to ignore recommended dependencies, this may cause problems!\n");
+		warnx("\t to ignore recommended ABI dependencies, this may cause problems!\n");
 	}
 
 	/*
Index: ./pkgtools/pkg_install/files/add/pkg_add.1
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1,v
retrieving revision 1.16
diff -u -r1.16 pkg_add.1
--- ./pkgtools/pkg_install/files/add/pkg_add.1	5 Nov 2005 13:20:09 -0000	1.16
+++ ./pkgtools/pkg_install/files/add/pkg_add.1	4 Apr 2006 06:26:56 -0000
@@ -401,8 +401,10 @@
 The package build information from
 .Pa +BUILD_INFO
 is then checked for
-.Ev IGNORE_RECOMMENDED .
-If the package was built with dependency recommendations ignored,
+.Ev USE_ABI_DEPENDS=NO
+(or
+.Ev IGNORE_RECOMMENDED).
+If the package was built with ABI dependency recommendations ignored,
 a warning will be issued.
 .It
 If the package contains a
Index: ./pkgtools/pkg_install/files/add/pkg_add.cat1
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/add/pkg_add.cat1,v
retrieving revision 1.15
diff -u -r1.15 pkg_add.cat1
--- ./pkgtools/pkg_install/files/add/pkg_add.cat1	5 Nov 2005 13:20:09 -0000	1.15
+++ ./pkgtools/pkg_install/files/add/pkg_add.cat1	4 Apr 2006 06:26:56 -0000
@@ -222,7 +222,7 @@
                 is overridable with the --ff flag.
 
            7.   The package build information from _+_B_U_I_L_D___I_N_F_O is then checked
-                for IGNORE_RECOMMENDED.  If the package was built with depen-
+                for IGNORE_ABI_DEPENDS.  If the package was built with depen-
                 dency recommendations ignored, a warning will be issued.
 
            8.   If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)),
Index: ./pkgtools/pkg_install/files/lib/lib.h
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/lib.h,v
retrieving revision 1.21
diff -u -r1.21 lib.h
--- ./pkgtools/pkg_install/files/lib/lib.h	6 Dec 2005 01:08:09 -0000	1.21
+++ ./pkgtools/pkg_install/files/lib/lib.h	4 Apr 2006 06:26:56 -0000
@@ -228,8 +228,9 @@
 	BI_OPSYS,		/*  0 */
 	BI_OS_VERSION,		/*  1 */
 	BI_MACHINE_ARCH,	/*  2 */
-	BI_IGNORE_RECOMMENDED,	/*  3 */
-	BI_ENUM_COUNT		/*  4 */
+	BI_RECOMMENDED,		/*  3 */
+	BI_ENUM_COUNT,		/*  4 */
+	BI_USE_ABI_DEPENDS,	/*  5 */
 }	bi_ent_t;
 
 /* Types */
Index: ./pkgtools/pkglint/files/makevars.map
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/makevars.map,v
retrieving revision 1.79
diff -u -r1.79 makevars.map
--- ./pkgtools/pkglint/files/makevars.map	14 Mar 2006 14:20:13 -0000	1.79
+++ ./pkgtools/pkglint/files/makevars.map	4 Apr 2006 06:26:56 -0000
@@ -23,7 +23,7 @@
 MKCRYPTO		YesNo
 USETBL			Yes
 ABI			{ 32 64 }
-IGNORE_RECOMMENDED	YesNo
+USE_ABI_DEPENDS		YesNo
 PKG_REGISTER_SHELLS	YesNo
 USE_XPKGWEDGE		YesNo
 LIBTOOLIZE_PLIST	YesNo
@@ -71,7 +71,7 @@
 BUILDLINK_PASSTHRU_RPATHDIRS	List+ of Pathname
 BUILDLINK_PKGSRCDIR	RelativePkgDir
 BUILDLINK_PREFIX	Pathname
-BUILDLINK_RECOMMENDED	InternalList+ of Dependency
+BUILDLINK_ABI_DEPENDS	InternalList+ of Dependency
 BUILDLINK_RPATHDIRS	List of Pathname
 BUILDLINK_TARGETS	List+ of Identifier
 BUILDLINK_TRANSFORM	List+
Index: ./pkgtools/pkglint/files/pkglint.pl
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/pkglint.pl,v
retrieving revision 1.549
diff -u -r1.549 pkglint.pl
--- ./pkgtools/pkglint/files/pkglint.pl	12 Mar 2006 16:55:51 -0000	1.549
+++ ./pkgtools/pkglint/files/pkglint.pl	4 Apr 2006 06:26:57 -0000
@@ -1452,7 +1452,7 @@
 		.*_SED
 		.*_SKIP
 		BUILDLINK_LDADD
-		BUILDLINK_RECOMMENDED
+		BUILDLINK_ABI_DEPENDS
 		COMMENT
 		EXTRACT_ONLY
 		GENERATE_PLIST
@@ -3499,7 +3499,7 @@
 	if ($op eq "?=" && defined($seen_bsd_prefs_mk) && !$seen_bsd_prefs_mk) {
 		if ($varbase eq "BUILDLINK_PKGSRCDIR"
 		    || $varbase eq "BUILDLINK_DEPMETHOD"
-		    || $varbase eq "BUILDLINK_RECOMMENDED") {
+		    || $varbase eq "BUILDLINK_ABI_DEPENDS") {
 			# FIXME: What about these ones? They occur quite often.
 		} else {
 			$opt_warn_extra and $line->log_warning("Please include \"../../mk/bsd.prefs.mk\" before using \"?=\".");
Index: ./pkgtools/revbump/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/revbump/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- ./pkgtools/revbump/DESCR	5 Jan 2005 00:31:38 -0000	1.1.1.1
+++ ./pkgtools/revbump/DESCR	4 Apr 2006 06:26:57 -0000
@@ -1,4 +1,4 @@
-Tools for bumping PKGREVISIONs and adapting BUILDLINK_RECOMMENDED
+Tools for bumping PKGREVISIONs and adapting BUILDLINK_ABI_DEPENDS
 versions to the latest version automatically.
 
 This tool is mostly intended for pkgsrc developers with commit
Index: ./pkgtools/revbump/files/blbump
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/revbump/files/blbump,v
retrieving revision 1.3
diff -u -r1.3 blbump
--- ./pkgtools/revbump/files/blbump	9 Mar 2006 17:24:48 -0000	1.3
+++ ./pkgtools/revbump/files/blbump	4 Apr 2006 06:26:57 -0000
@@ -89,11 +89,11 @@
 
     $done = 0;
     while (<OLDBL>) {
-        if ($done == 0 && /^(BUILDLINK_RECOMMENDED.+=[ \t]+)(.+)$/) {
+        if ($done == 0 && /^(BUILDLINK_ABI_DEPENDS.+=[ \t]+)(.+)$/) {
             print NEWBL "$1$pkgver\n";
 	    $done = 1;
         } elsif ($done == 0 && /^BUILDLINK_PKGSRCDIR(.*=[ \t]+)/) {
-            print NEWBL "BUILDLINK_RECOMMENDED${1}$pkgver\n";
+            print NEWBL "BUILDLINK_ABI_DEPENDS${1}$pkgver\n";
             print NEWBL $_;
             $done = 1;
         } else {
Index: ./pkgtools/revbump/files/blbump.1
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/revbump/files/blbump.1,v
retrieving revision 1.3
diff -u -r1.3 blbump.1
--- ./pkgtools/revbump/files/blbump.1	7 Mar 2006 04:30:54 -0000	1.3
+++ ./pkgtools/revbump/files/blbump.1	4 Apr 2006 06:26:57 -0000
@@ -49,7 +49,7 @@
 Given a package (in
 .Ar category/package
 format) on the command line or stdin, it will try to adjust the
-.Dv BUILDLINK_RECOMMENDED
+.Dv BUILDLINK_ABI_DEPENDS
 line for that package to the current version automatically.
 .Pp
 .Nm Fl h
Index: ./pkgtools/revbump/files/revbump.1
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/revbump/files/revbump.1,v
retrieving revision 1.5
diff -u -r1.5 revbump.1
--- ./pkgtools/revbump/files/revbump.1	7 Mar 2006 06:51:20 -0000	1.5
+++ ./pkgtools/revbump/files/revbump.1	4 Apr 2006 06:26:57 -0000
@@ -89,7 +89,7 @@
 grep buildlink3.mk allbump | sed 's/.buildlink3.mk//' \*[Gt] bl3bump
 grep -v buildlink3.mk allbump | sed 's/.Makefile$//' \*[Gt] makebump
 blbump \*[Lt] bl3bump \*[Gt] bl3bump.manual
-[handle the *RECOMMENDED* bumps in bl3bump.manual manually]
+[handle the *ABI_DEPENDS* bumps in bl3bump.manual manually]
 revbump \*[Lt] makebump \*[Gt] makebump.manual
 [handle the PKGREVISION bumps in makebump.manual manually;
  this will include any Makefile.common files - the files that include
Index: ./pkgtools/x11-links/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./pkgtools/x11-links/buildlink3.mk	10 Jun 2005 03:44:07 -0000	1.4
+++ ./pkgtools/x11-links/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -17,7 +17,7 @@
 BUILDLINK_PACKAGES:=	x11-links ${BUILDLINK_PACKAGES}
 
 .if !empty(X11_LINKS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.x11-links+=	x11-links>=0.25
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.25
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
Index: ./print/a2ps/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/a2ps/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./print/a2ps/buildlink3.mk	5 Feb 2006 23:10:35 -0000	1.2
+++ ./print/a2ps/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	a2ps
 
 .if !empty(A2PS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.a2ps+=	a2ps>=4.13.0.2nb4
-BUILDLINK_RECOMMENDED.a2ps?=	a2ps>=4.13.0.2nb10
+BUILDLINK_API_DEPENDS.a2ps+=	a2ps>=4.13.0.2nb4
+BUILDLINK_ABI_DEPENDS.a2ps?=	a2ps>=4.13.0.2nb10
 BUILDLINK_PKGSRCDIR.a2ps?=	../../print/a2ps
 .endif	# A2PS_BUILDLINK3_MK
 
Index: ./print/cups/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./print/cups/buildlink3.mk	5 Feb 2006 23:10:35 -0000	1.14
+++ ./print/cups/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cups
 
 .if !empty(CUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cups+=	cups>=1.1.19nb3
-BUILDLINK_RECOMMENDED.cups+=	cups>=1.1.23nb6
+BUILDLINK_API_DEPENDS.cups+=	cups>=1.1.19nb3
+BUILDLINK_ABI_DEPENDS.cups+=	cups>=1.1.23nb6
 BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 .endif	# CUPS_BUILDLINK3_MK
 
Index: ./print/dvipng/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/dvipng/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./print/dvipng/Makefile	5 Mar 2006 16:27:28 -0000	1.21
+++ ./print/dvipng/Makefile	4 Apr 2006 06:26:57 -0000
@@ -14,7 +14,7 @@
 
 INFO_FILES=		dvipng.info
 
-BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.1.3
+BUILDLINK_API_DEPENDS.freetype2?=	freetype2>=2.1.3
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
Index: ./print/gimp-print-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/gimp-print-lib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./print/gimp-print-lib/buildlink3.mk	5 Feb 2006 23:10:37 -0000	1.5
+++ ./print/gimp-print-lib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gimp-print-lib
 
 .if !empty(GIMP_PRINT_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gimp-print-lib+=	gimp-print-lib>=4.2.5nb1
-BUILDLINK_RECOMMENDED.gimp-print-lib+=	gimp-print-lib>=4.2.7nb2
+BUILDLINK_API_DEPENDS.gimp-print-lib+=	gimp-print-lib>=4.2.5nb1
+BUILDLINK_ABI_DEPENDS.gimp-print-lib+=	gimp-print-lib>=4.2.7nb2
 BUILDLINK_PKGSRCDIR.gimp-print-lib?=	../../print/gimp-print-lib
 .endif	# GIMP_PRINT_LIB_BUILDLINK3_MK
 
Index: ./print/gnome-print/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/gnome-print/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./print/gnome-print/buildlink3.mk	5 Feb 2006 23:10:37 -0000	1.3
+++ ./print/gnome-print/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-print
 
 .if !empty(GNOME_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-print+=	gnome-print>=0.36nb4
-BUILDLINK_RECOMMENDED.gnome-print+=	gnome-print>=0.37nb1
+BUILDLINK_API_DEPENDS.gnome-print+=	gnome-print>=0.36nb4
+BUILDLINK_ABI_DEPENDS.gnome-print+=	gnome-print>=0.37nb1
 BUILDLINK_PKGSRCDIR.gnome-print?=	../../print/gnome-print
 .endif	# GNOME_PRINT_BUILDLINK3_MK
 
Index: ./print/ijs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/ijs/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./print/ijs/buildlink3.mk	5 Feb 2006 23:10:37 -0000	1.3
+++ ./print/ijs/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ijs
 
 .if !empty(IJS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ijs+=	ijs>=0.34
-BUILDLINK_RECOMMENDED.ijs+=	ijs>=0.34nb2
+BUILDLINK_API_DEPENDS.ijs+=	ijs>=0.34
+BUILDLINK_ABI_DEPENDS.ijs+=	ijs>=0.34nb2
 BUILDLINK_PKGSRCDIR.ijs?=	../../print/ijs
 .endif	# IJS_BUILDLINK3_MK
 
Index: ./print/ja-vflib-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/ja-vflib-lib/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./print/ja-vflib-lib/buildlink3.mk	5 Feb 2006 23:10:37 -0000	1.3
+++ ./print/ja-vflib-lib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ja-vflib-lib
 
 .if !empty(JA_VFLIB_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ja-vflib-lib+=	ja-vflib-lib>=2.24.2
-BUILDLINK_RECOMMENDED.ja-vflib-lib+=	ja-vflib-lib>=2.24.2nb2
+BUILDLINK_API_DEPENDS.ja-vflib-lib+=	ja-vflib-lib>=2.24.2
+BUILDLINK_ABI_DEPENDS.ja-vflib-lib+=	ja-vflib-lib>=2.24.2nb2
 BUILDLINK_PKGSRCDIR.ja-vflib-lib?=	../../print/ja-vflib-lib
 .endif	# JA_VFLIB_LIB_BUILDLINK3_MK
 
Index: ./print/ja-vflib-utils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/ja-vflib-utils/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./print/ja-vflib-utils/Makefile	5 Feb 2006 23:10:37 -0000	1.9
+++ ./print/ja-vflib-utils/Makefile	4 Apr 2006 06:26:57 -0000
@@ -6,7 +6,7 @@
 PKGREVISION=	2
 COMMENT=	Utilities for manipulating VFlib vector font files
 
-BUILDLINK_DEPENDS.vflib+=	ja-vflib-lib>=${VFLIB_VERSION}
+BUILDLINK_API_DEPENDS.vflib+=	ja-vflib-lib>=${VFLIB_VERSION}
 
 CONFIGURE_ARGS+=	--enable-tools --with-x
 
Index: ./print/libgnomecups/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomecups/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./print/libgnomecups/buildlink3.mk	5 Feb 2006 23:10:38 -0000	1.5
+++ ./print/libgnomecups/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomecups
 
 .if !empty(LIBGNOMECUPS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecups+=	libgnomecups>=0.2.0
-BUILDLINK_RECOMMENDED.libgnomecups?=	libgnomecups>=0.2.2nb2
+BUILDLINK_API_DEPENDS.libgnomecups+=	libgnomecups>=0.2.0
+BUILDLINK_ABI_DEPENDS.libgnomecups?=	libgnomecups>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.libgnomecups?=	../../print/libgnomecups
 .endif	# LIBGNOMECUPS_BUILDLINK3_MK
 
Index: ./print/libgnomeprint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprint/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- ./print/libgnomeprint/Makefile	5 Feb 2006 23:10:38 -0000	1.47
+++ ./print/libgnomeprint/Makefile	4 Apr 2006 06:26:57 -0000
@@ -18,7 +18,7 @@
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.4
+BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.4
 
 PKGCONFIG_OVERRIDE=	libgnomeprint/libgnomeprint-2.2.pc.in
 
Index: ./print/libgnomeprint/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprint/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./print/libgnomeprint/buildlink3.mk	5 Feb 2006 23:10:38 -0000	1.9
+++ ./print/libgnomeprint/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	libgnomeprint
 
 .if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprint+=	libgnomeprint>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 .endif	# LIBGNOMEPRINT_BUILDLINK3_MK
 
Index: ./print/libgnomeprintui/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprintui/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- ./print/libgnomeprintui/Makefile	5 Feb 2006 23:10:38 -0000	1.42
+++ ./print/libgnomeprintui/Makefile	4 Apr 2006 06:26:57 -0000
@@ -23,7 +23,7 @@
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
+BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
Index: ./print/libgnomeprintui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/libgnomeprintui/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./print/libgnomeprintui/buildlink3.mk	5 Feb 2006 23:10:38 -0000	1.8
+++ ./print/libgnomeprintui/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgnomeprintui
 
 .if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.0
-BUILDLINK_RECOMMENDED.libgnomeprintui+=	libgnomeprintui>=2.12.1nb2
+BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.0
+BUILDLINK_ABI_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
Index: ./print/lilypond/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/lilypond/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- ./print/lilypond/Makefile	21 Mar 2006 06:00:48 -0000	1.42
+++ ./print/lilypond/Makefile	4 Apr 2006 06:26:57 -0000
@@ -13,7 +13,7 @@
 DEPENDS+=	ec-fonts-mftraced-[0-9]*:../../fonts/ec-fonts-mftraced
 BUILD_DEPENDS+=	bison>=1.875nb1:../../devel/bison
 
-BUILDLINK_DEPENDS.mftrace+=	mftrace>=1.1.0
+BUILDLINK_API_DEPENDS.mftrace+=	mftrace>=1.1.0
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
Index: ./print/pdflib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/pdflib/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./print/pdflib/buildlink3.mk	5 Feb 2006 23:10:38 -0000	1.7
+++ ./print/pdflib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pdflib
 
 .if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
-BUILDLINK_RECOMMENDED.pdflib+=	pdflib>=4.0.3nb6
+BUILDLINK_API_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
+BUILDLINK_ABI_DEPENDS.pdflib+=	pdflib>=4.0.3nb6
 BUILDLINK_PKGSRCDIR.pdflib?=	../../print/pdflib
 .endif	# PDFLIB_BUILDLINK3_MK
 
Index: ./print/poppler/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/poppler/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./print/poppler/buildlink3.mk	9 Mar 2006 01:19:16 -0000	1.5
+++ ./print/poppler/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	poppler
 
 .if !empty(POPPLER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler+=	poppler>=0.4.5nb1
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.4.5nb1
 BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 .endif	# POPPLER_BUILDLINK3_MK
 
Index: ./print/poppler-glib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/poppler-glib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./print/poppler-glib/Makefile	9 Mar 2006 01:15:58 -0000	1.2
+++ ./print/poppler-glib/Makefile	4 Apr 2006 06:26:57 -0000
@@ -28,7 +28,7 @@
 	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/lib/pkgconfig
 
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: ./print/poppler-glib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/poppler-glib/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./print/poppler-glib/buildlink3.mk	9 Mar 2006 01:13:16 -0000	1.1.1.1
+++ ./print/poppler-glib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	poppler-glib
 
 .if !empty(POPPLER_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-glib+=	poppler-glib>=0.4.5
+BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.4.5
 BUILDLINK_PKGSRCDIR.poppler-glib?=	../../print/poppler-glib
 .endif	# POPPLER_GLIB_BUILDLINK3_MK
 
Index: ./print/poppler-qt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/poppler-qt/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./print/poppler-qt/Makefile	9 Mar 2006 01:29:46 -0000	1.7
+++ ./print/poppler-qt/Makefile	4 Apr 2006 06:26:57 -0000
@@ -28,7 +28,7 @@
 	${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
 
-BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
+BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
Index: ./print/poppler-qt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/poppler-qt/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./print/poppler-qt/buildlink3.mk	9 Mar 2006 01:29:46 -0000	1.4
+++ ./print/poppler-qt/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	poppler-qt
 
 .if !empty(POPPLER_QT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.poppler-qt+=	poppler-qt>=0.4.5nb1
+BUILDLINK_API_DEPENDS.poppler-qt+=	poppler-qt>=0.4.5nb1
 BUILDLINK_PKGSRCDIR.poppler-qt?=	../../print/poppler-qt
 .endif	# POPPLER_QT_BUILDLINK3_MK
 
Index: ./print/pslib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/pslib/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./print/pslib/buildlink3.mk	5 Feb 2006 23:10:38 -0000	1.3
+++ ./print/pslib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -21,8 +21,8 @@
 BUILDLINK_PACKAGES+=	pslib
 
 .if !empty(PSLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pslib+=	pslib>=0.2.6
-BUILDLINK_RECOMMENDED.pslib?=	pslib>=0.2.6nb3
+BUILDLINK_API_DEPENDS.pslib+=	pslib>=0.2.6
+BUILDLINK_ABI_DEPENDS.pslib?=	pslib>=0.2.6nb3
 BUILDLINK_PKGSRCDIR.pslib?=	../../print/pslib
 .endif	# PSLIB_BUILDLINK3_MK
 
Index: ./print/py-reportlab/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/py-reportlab/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./print/py-reportlab/buildlink3.mk	5 Feb 2006 23:10:39 -0000	1.3
+++ ./print/py-reportlab/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyreportlab
 
 .if !empty(PYREPORTLAB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
-BUILDLINK_RECOMMENDED.pyreportlab?=	${PYPKGPREFIX}-reportlab>=1.20nb2
+BUILDLINK_API_DEPENDS.pyreportlab+=		${PYPKGPREFIX}-reportlab-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyreportlab?=	${PYPKGPREFIX}-reportlab>=1.20nb2
 BUILDLINK_PKGSRCDIR.pyreportlab?=	../../print/py-reportlab
 .endif	# PYREPORTLAB_BUILDLINK3_MK
 
Index: ./print/py-reportlab-renderPM/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/py-reportlab-renderPM/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./print/py-reportlab-renderPM/buildlink3.mk	5 Feb 2006 23:10:39 -0000	1.2
+++ ./print/py-reportlab-renderPM/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyrlrenderpm
 
 .if !empty(PYRLRENDERPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyrlrenderpm+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
-BUILDLINK_RECOMMENDED.pyrlrenderpm?=	${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
+BUILDLINK_API_DEPENDS.pyrlrenderpm+=	${PYPKGPREFIX}-reportlab-renderPM-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyrlrenderpm?=	${PYPKGPREFIX}-reportlab-renderPM>=0.9nb2
 BUILDLINK_PKGSRCDIR.pyrlrenderpm?=	../../print/py-reportlab-renderPM
 .endif	# PYRLRENDERPM_BUILDLINK3_MK
 
Index: ./print/tcl-pdflib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/tcl-pdflib/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./print/tcl-pdflib/Makefile	5 Feb 2006 23:10:39 -0000	1.13
+++ ./print/tcl-pdflib/Makefile	4 Apr 2006 06:26:57 -0000
@@ -6,7 +6,7 @@
 PKGREVISION=		4
 COMMENT=		Tcl interface to PDFlib for generating PDF files
 
-BUILDLINK_DEPENDS.pdflib+=	pdflib>=${PDFLIB_BASE_VERS}
+BUILDLINK_API_DEPENDS.pdflib+=	pdflib>=${PDFLIB_BASE_VERS}
 
 CONFIGURE_ARGS+=	--with-tcl=${TCLSH:Q}
 CONFIGURE_ARGS+=        --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
Index: ./print/teTeX/module.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX/module.mk,v
retrieving revision 1.12
diff -u -r1.12 module.mk
--- ./print/teTeX/module.mk	14 Mar 2006 01:14:32 -0000	1.12
+++ ./print/teTeX/module.mk	4 Apr 2006 06:26:57 -0000
@@ -19,7 +19,7 @@
 TEX_FONTMAPS?=		# empty
 
 .if !empty(TEX_FONTMAPS)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb4
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb4
 .endif
 
 FILES_SUBST+=		MKTEXLSR="${LOCALBASE}/bin/mktexlsr"
Index: ./print/teTeX-bin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX-bin/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./print/teTeX-bin/buildlink3.mk	5 Feb 2006 23:10:39 -0000	1.6
+++ ./print/teTeX-bin/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin-2.[0-9]*
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=2.0.2nb6
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin-2.[0-9]*
+BUILDLINK_ABI_DEPENDS.teTeX-bin?=	teTeX-bin>=2.0.2nb6
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
Index: ./print/teTeX1-bin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX1-bin/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./print/teTeX1-bin/buildlink3.mk	5 Feb 2006 23:10:39 -0000	1.5
+++ ./print/teTeX1-bin/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin-1.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin-1.[0-9]*
 BUILDLINK_DEPMETHOD.teTeX-bin?=	build
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=1.0.7nb6
+BUILDLINK_ABI_DEPENDS.teTeX-bin?=	teTeX-bin>=1.0.7nb6
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX1-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
Index: ./print/teTeX3-bin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/teTeX3-bin/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./print/teTeX3-bin/buildlink3.mk	5 Feb 2006 23:10:39 -0000	1.5
+++ ./print/teTeX3-bin/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	teTeX-bin
 
 .if !empty(TETEX_BIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb2
-BUILDLINK_RECOMMENDED.teTeX-bin?=	teTeX-bin>=3.0nb7
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb2
+BUILDLINK_ABI_DEPENDS.teTeX-bin?=	teTeX-bin>=3.0nb7
 BUILDLINK_PKGSRCDIR.teTeX-bin?=	../../print/teTeX3-bin
 .endif	# TETEX_BIN_BUILDLINK3_MK
 
Index: ./print/transfig/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/transfig/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./print/transfig/buildlink3.mk	5 Feb 2006 23:10:41 -0000	1.2
+++ ./print/transfig/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	transfig
 
 .if !empty(TRANSFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.transfig+=	transfig>=3.2.4
-BUILDLINK_RECOMMENDED.transfig?=	transfig>=3.2.5alpha7nb1
+BUILDLINK_API_DEPENDS.transfig+=	transfig>=3.2.4
+BUILDLINK_ABI_DEPENDS.transfig?=	transfig>=3.2.5alpha7nb1
 BUILDLINK_PKGSRCDIR.transfig?=	../../print/transfig
 .endif	# TRANSFIG_BUILDLINK3_MK
 
Index: ./print/xfce4-print/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/xfce4-print/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./print/xfce4-print/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.12
+++ ./print/xfce4-print/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-print
 
 .if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-print?=	xfce4-print>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-print?=	xfce4-print>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
 .endif	# XFCE4_PRINT_BUILDLINK3_MK
 
Index: ./security/PAM/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/PAM/buildlink3.mk,v
retrieving revision 1.20
diff -u -r1.20 buildlink3.mk
--- ./security/PAM/buildlink3.mk	5 Feb 2006 23:10:42 -0000	1.20
+++ ./security/PAM/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	linux-pam
 
 .if !empty(LINUX_PAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.linux-pam+=		PAM>=0.75
-BUILDLINK_RECOMMENDED.linux-pam+=	PAM>=0.77nb5
+BUILDLINK_API_DEPENDS.linux-pam+=		PAM>=0.75
+BUILDLINK_ABI_DEPENDS.linux-pam+=	PAM>=0.77nb5
 BUILDLINK_PKGSRCDIR.linux-pam?=		../../security/PAM
 .endif	# LINUX_PAM_BUILDLINK3_MK
 
Index: ./security/PAM/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/PAM/builtin.mk,v
retrieving revision 1.12
diff -u -r1.12 builtin.mk
--- ./security/PAM/builtin.mk	1 Jun 2005 18:03:20 -0000	1.12
+++ ./security/PAM/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -33,7 +33,7 @@
 .    if defined(BUILTIN_PKG.linux-pam) && \
         !empty(IS_BUILTIN.linux-pam:M[yY][eE][sS])
 USE_BUILTIN.linux-pam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.linux-pam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.linux-pam}
 .        if !empty(USE_BUILTIN.linux-pam:M[yY][eE][sS])
 USE_BUILTIN.linux-pam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.linux-pam:Q}; then \
Index: ./security/aide/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/aide/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./security/aide/Makefile	4 Mar 2006 21:30:33 -0000	1.24
+++ ./security/aide/Makefile	4 Apr 2006 06:26:57 -0000
@@ -10,7 +10,7 @@
 HOMEPAGE=	http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=	Free intrusion detection system for checking file integrity
 
-BUILDLINK_DEPENDS.mhash?=	mhash>=0.8.17
+BUILDLINK_API_DEPENDS.mhash?=	mhash>=0.8.17
 
 
 GNU_CONFIGURE=	yes
Index: ./security/beecrypt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/beecrypt/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/beecrypt/buildlink3.mk	3 Oct 2004 00:18:07 -0000	1.2
+++ ./security/beecrypt/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	beecrypt
 
 .if !empty(BEECRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.beecrypt+=	beecrypt>=3.0.0
-BUILDLINK_RECOMMENDED.beecrypt+=	beecrypt>=3.0.0nb1
+BUILDLINK_API_DEPENDS.beecrypt+=	beecrypt>=3.0.0
+BUILDLINK_ABI_DEPENDS.beecrypt+=	beecrypt>=3.0.0nb1
 BUILDLINK_PKGSRCDIR.beecrypt?=	../../security/beecrypt
 .endif	# BEECRYPT_BUILDLINK3_MK
 
Index: ./security/botan/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/botan/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./security/botan/buildlink3.mk	13 Feb 2006 17:19:42 -0000	1.1
+++ ./security/botan/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	botan
 
 .if !empty(BOTAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.botan+=	botan>=1.4.11
+BUILDLINK_API_DEPENDS.botan+=	botan>=1.4.11
 BUILDLINK_PKGSRCDIR.botan?=	../../security/botan
 .endif	# BOTAN_BUILDLINK3_MK
 
Index: ./security/courier-authlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/courier-authlib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/courier-authlib/buildlink3.mk	5 Feb 2006 23:10:42 -0000	1.2
+++ ./security/courier-authlib/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	courier-authlib
 
 .if !empty(COURIER_AUTHLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.courier-authlib+=	courier-authlib>=0.53
-BUILDLINK_RECOMMENDED.courier-authlib?=	courier-authlib>=0.58nb2
+BUILDLINK_API_DEPENDS.courier-authlib+=	courier-authlib>=0.53
+BUILDLINK_ABI_DEPENDS.courier-authlib?=	courier-authlib>=0.58nb2
 BUILDLINK_PKGSRCDIR.courier-authlib?=	../../security/courier-authlib
 .endif	# COURIER_AUTHLIB_BUILDLINK3_MK
 
Index: ./security/crypto++/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/crypto++/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/crypto++/buildlink3.mk	5 Feb 2006 23:10:42 -0000	1.3
+++ ./security/crypto++/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	cryptopp
 
 .if !empty(CRYPTOPP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cryptopp+=	cryptopp>=5.1
+BUILDLINK_API_DEPENDS.cryptopp+=	cryptopp>=5.1
 BUILDLINK_DEPMETHOD.cryptopp?=	build
-BUILDLINK_RECOMMENDED.cryptopp?=	cryptopp>=5.2.1nb1
+BUILDLINK_ABI_DEPENDS.cryptopp?=	cryptopp>=5.2.1nb1
 BUILDLINK_PKGSRCDIR.cryptopp?=	../../security/cryptopp
 .endif	# CRYPTOPP_BUILDLINK3_MK
 
Index: ./security/cvm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/cvm/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/cvm/buildlink3.mk	24 Aug 2005 04:49:31 -0000	1.2
+++ ./security/cvm/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	cvm
 
 .if !empty(CVM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cvm+=		cvm>=0.75
+BUILDLINK_API_DEPENDS.cvm+=		cvm>=0.75
 BUILDLINK_PKGSRCDIR.cvm?=	../../security/cvm
 BUILDLINK_DEPMETHOD.cvm?=	build
 .endif	# CVM_BUILDLINK3_MK
Index: ./security/cyrus-sasl2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/cyrus-sasl2/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./security/cyrus-sasl2/buildlink3.mk	5 Feb 2006 23:10:43 -0000	1.9
+++ ./security/cyrus-sasl2/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cyrus-sasl
 
 .if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
-BUILDLINK_RECOMMENDED.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
+BUILDLINK_API_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
+BUILDLINK_ABI_DEPENDS.cyrus-sasl?=	cyrus-sasl>=2.1.20nb3
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
Index: ./security/dirb/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/dirb/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./security/dirb/Makefile	5 Feb 2006 23:10:43 -0000	1.4
+++ ./security/dirb/Makefile	4 Apr 2006 06:26:57 -0000
@@ -16,7 +16,7 @@
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-BUILDLINK_DEPENDS.curl+=	curl>=7.15.0nb1
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.15.0nb1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./security/dirmngr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/dirmngr/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./security/dirmngr/buildlink3.mk	5 Feb 2006 23:10:43 -0000	1.4
+++ ./security/dirmngr/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	dirmngr
 
 .if !empty(DIRMNGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
-BUILDLINK_RECOMMENDED.dirmngr?=	dirmngr>=0.9.3nb2
+BUILDLINK_API_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
+BUILDLINK_ABI_DEPENDS.dirmngr?=	dirmngr>=0.9.3nb2
 BUILDLINK_PKGSRCDIR.dirmngr?=	../../security/dirmngr
 .endif	# DIRMNGR_BUILDLINK3_MK
 
Index: ./security/dsniff/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/security/dsniff/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- ./security/dsniff/Makefile.common	4 Mar 2006 21:30:33 -0000	1.3
+++ ./security/dsniff/Makefile.common	4 Apr 2006 06:26:57 -0000
@@ -10,7 +10,7 @@
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 PATCHDIR=	${.CURDIR}/../dsniff/patches
 DISTINFO_FILE=	${.CURDIR}/../dsniff/distinfo
Index: ./security/gnome-keyring/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnome-keyring/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./security/gnome-keyring/Makefile	13 Mar 2006 18:27:46 -0000	1.19
+++ ./security/gnome-keyring/Makefile	4 Apr 2006 06:26:57 -0000
@@ -19,8 +19,8 @@
 
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gnome-keyring-1.pc.in
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./security/gnome-keyring/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnome-keyring/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/gnome-keyring/buildlink3.mk	5 Feb 2006 23:10:43 -0000	1.5
+++ ./security/gnome-keyring/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-keyring
 
 .if !empty(GNOME_KEYRING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
-BUILDLINK_RECOMMENDED.gnome-keyring+=	gnome-keyring>=0.4.6nb2
+BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.0
+BUILDLINK_ABI_DEPENDS.gnome-keyring+=	gnome-keyring>=0.4.6nb2
 BUILDLINK_PKGSRCDIR.gnome-keyring?=	../../security/gnome-keyring
 
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./security/gnupg-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnupg-devel/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./security/gnupg-devel/Makefile	5 Feb 2006 23:10:43 -0000	1.14
+++ ./security/gnupg-devel/Makefile	4 Apr 2006 06:26:57 -0000
@@ -54,7 +54,7 @@
 pre-configure:
 	cd  ${WRKDIR}/pth-2.0.4 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
Index: ./security/gnupg-devel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnupg-devel/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/gnupg-devel/buildlink3.mk	5 Feb 2006 23:10:43 -0000	1.3
+++ ./security/gnupg-devel/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnupg-devel
 
 .if !empty(GNUPG_DEVEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.11
-BUILDLINK_RECOMMENDED.gnupg-devel+=	gnupg-devel>=1.9.20nb1
+BUILDLINK_API_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.11
+BUILDLINK_ABI_DEPENDS.gnupg-devel+=	gnupg-devel>=1.9.20nb1
 BUILDLINK_PKGSRCDIR.gnupg-devel?=	../../security/gnupg-devel
 .endif	# GNUPG_DEVEL_BUILDLINK3_MK
 BUILDLINK_PREFIX.gnupg-devel?=	${LOCALBASE}
Index: ./security/gnutls/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- ./security/gnutls/Makefile	9 Mar 2006 17:25:54 -0000	1.46
+++ ./security/gnutls/Makefile	4 Apr 2006 06:26:57 -0000
@@ -25,9 +25,9 @@
 PKGCONFIG_OVERRIDE=	lib/gnutls.pc.in
 PKGCONFIG_OVERRIDE+=	libextra/gnutls-extra.pc.in
 
-BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.5
-BUILDLINK_DEPENDS.libtasn1+=	libtasn1>=0.3.1
-BUILDLINK_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2
+BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.5
+BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.3.1
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2
 
 MAKE_ENV+=		RM=${RM:Q}
 MAKE_ENV+=		TZ=UTC
Index: ./security/gnutls/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gnutls/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./security/gnutls/buildlink3.mk	6 Mar 2006 00:18:10 -0000	1.13
+++ ./security/gnutls/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnutls
 
 .if !empty(GNUTLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnutls+=	gnutls>=1.0.13
-BUILDLINK_RECOMMENDED.gnutls+=	gnutls>=1.3.4nb1
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=1.0.13
+BUILDLINK_ABI_DEPENDS.gnutls+=	gnutls>=1.3.4nb1
 BUILDLINK_PKGSRCDIR.gnutls?=	../../security/gnutls
 .endif	# GNUTLS_BUILDLINK3_MK
 
Index: ./security/gpgme/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/gpgme/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- ./security/gpgme/Makefile	1 Mar 2006 16:22:20 -0000	1.40
+++ ./security/gpgme/Makefile	4 Apr 2006 06:26:57 -0000
@@ -49,7 +49,7 @@
 .include "../../security/libgpg-error/buildlink3.mk"
 
 # we want the getenv_r() semantics of NetBSD-current
-BUILDLINK_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
+BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
 .include "../../devel/librfuncs/buildlink3.mk"
 
 ##
Index: ./security/gpgme/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gpgme/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./security/gpgme/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.10
+++ ./security/gpgme/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gpgme
 
 .if !empty(GPGME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=0.9.0
-BUILDLINK_RECOMMENDED.gpgme+=	gpgme>=1.0.3nb1
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=0.9.0
+BUILDLINK_ABI_DEPENDS.gpgme+=	gpgme>=1.0.3nb1
 BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
 .endif	# GPGME_BUILDLINK3_MK
 
Index: ./security/gpgme03/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gpgme03/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/gpgme03/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.5
+++ ./security/gpgme03/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gpgme03
 
 .if !empty(GPGME03_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gpgme03+=	gpgme03>=0.3.16
-BUILDLINK_RECOMMENDED.gpgme03+=	gpgme03>=0.3.16nb2
+BUILDLINK_API_DEPENDS.gpgme03+=	gpgme03>=0.3.16
+BUILDLINK_ABI_DEPENDS.gpgme03+=	gpgme03>=0.3.16nb2
 BUILDLINK_PKGSRCDIR.gpgme03?=	../../security/gpgme03
 
 BUILDLINK_FILES.gpgme03+=	bin/gpgme03-config
Index: ./security/gsasl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gsasl/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./security/gsasl/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.7
+++ ./security/gsasl/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gsasl
 
 .if !empty(GSASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gsasl+=	gsasl>=0.2.3
-BUILDLINK_RECOMMENDED.gsasl?=	gsasl>=0.2.5nb1
+BUILDLINK_API_DEPENDS.gsasl+=	gsasl>=0.2.3
+BUILDLINK_ABI_DEPENDS.gsasl?=	gsasl>=0.2.5nb1
 BUILDLINK_PKGSRCDIR.gsasl?=	../../security/gsasl
 .endif	# GSASL_BUILDLINK3_MK
 
Index: ./security/gss/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gss/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./security/gss/buildlink3.mk	3 Oct 2004 00:18:09 -0000	1.4
+++ ./security/gss/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gss
 
 .if !empty(GSS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gss+=		gss>=0.0.6nb1
-BUILDLINK_RECOMMENDED.gss+=	gss>=0.0.13nb1
+BUILDLINK_API_DEPENDS.gss+=		gss>=0.0.6nb1
+BUILDLINK_ABI_DEPENDS.gss+=	gss>=0.0.13nb1
 BUILDLINK_PKGSRCDIR.gss?=	../../security/gss
 .endif	# GSS_BUILDLINK3_MK
 
Index: ./security/heimdal/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/buildlink3.mk,v
retrieving revision 1.26
diff -u -r1.26 buildlink3.mk
--- ./security/heimdal/buildlink3.mk	26 Oct 2005 15:12:45 -0000	1.26
+++ ./security/heimdal/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	heimdal
 
 .if !empty(HEIMDAL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.4e
-BUILDLINK_RECOMMENDED.heimdal+=	heimdal>=0.6.3nb2
+BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.4e
+BUILDLINK_ABI_DEPENDS.heimdal+=	heimdal>=0.6.3nb2
 BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
 .endif	# HEIMDAL_BUILDLINK3_MK
Index: ./security/heimdal/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/heimdal/builtin.mk,v
retrieving revision 1.7
diff -u -r1.7 builtin.mk
--- ./security/heimdal/builtin.mk	26 Jan 2006 22:46:15 -0000	1.7
+++ ./security/heimdal/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -74,7 +74,7 @@
 .    if defined(BUILTIN_PKG.heimdal) && \
         !empty(IS_BUILTIN.heimdal:M[yY][eE][sS])
 USE_BUILTIN.heimdal=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.heimdal}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.heimdal}
 .        if !empty(USE_BUILTIN.heimdal:M[yY][eE][sS])
 USE_BUILTIN.heimdal!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.heimdal:Q}; then \
@@ -97,7 +97,7 @@
 .if !empty(CHECK_BUILTIN.heimdal:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.heimdal:M[nN][oO])
-BUILDLINK_DEPENDS.heimdal+=	heimdal>=0.6
+BUILDLINK_API_DEPENDS.heimdal+=	heimdal>=0.6
 
 KRB5_CONFIG?=	${BUILDLINK_PREFIX.heimdal}/bin/krb5-config
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}
Index: ./security/hydra/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/hydra/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./security/hydra/Makefile	5 Feb 2006 00:18:29 -0000	1.7
+++ ./security/hydra/Makefile	4 Apr 2006 06:26:57 -0000
@@ -32,7 +32,7 @@
 USE_OLD_DES_API=	YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-BUILDLINK_DEPENDS.libssh+=	libssh-0.11
+BUILDLINK_API_DEPENDS.libssh+=	libssh-0.11
 
 INSTALLATION_DIRS=	bin
 
Index: ./security/kth-krb4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/kth-krb4/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/kth-krb4/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.3
+++ ./security/kth-krb4/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -12,9 +12,9 @@
 BUILDLINK_PACKAGES+=	kth-krb4
 
 .if !empty(KTH_KRB4_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
-BUILDLINK_RECOMMENDED.kth-krb4+=kth-krb4>=1.2.1nb5
-BUILDLINK_RECOMMENDED.kth-krb4?=	kth-krb4>=1.2.1nb6
+BUILDLINK_API_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
+BUILDLINK_ABI_DEPENDS.kth-krb4+=kth-krb4>=1.2.1nb5
+BUILDLINK_ABI_DEPENDS.kth-krb4?=	kth-krb4>=1.2.1nb6
 BUILDLINK_PKGSRCDIR.kth-krb4?=	../../security/kth-krb4
 .endif	# KTH_KRB4_BUILDLINK3_MK
 
Index: ./security/libassuan/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/libassuan/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./security/libassuan/Makefile	5 Feb 2006 23:10:44 -0000	1.8
+++ ./security/libassuan/Makefile	4 Apr 2006 06:26:57 -0000
@@ -16,7 +16,7 @@
 
 INFO_FILES=		assuan.info
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./security/libassuan/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libassuan/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/libassuan/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.2
+++ ./security/libassuan/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libassuan
 
 .if !empty(LIBASSUAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libassuan+=	libassuan>=0.6.7
-BUILDLINK_RECOMMENDED.libassuan?=	libassuan>=0.6.10nb2
+BUILDLINK_API_DEPENDS.libassuan+=	libassuan>=0.6.7
+BUILDLINK_ABI_DEPENDS.libassuan?=	libassuan>=0.6.10nb2
 BUILDLINK_PKGSRCDIR.libassuan?=	../../security/libassuan
 .endif	# LIBASSUAN_BUILDLINK3_MK
 
Index: ./security/libcrack/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libcrack/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./security/libcrack/buildlink3.mk	3 Oct 2004 00:18:09 -0000	1.6
+++ ./security/libcrack/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcrack
 
 .if !empty(LIBCRACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcrack+=	libcrack>=2.7
-BUILDLINK_RECOMMENDED.libcrack+=	libcrack>=2.7nb1
+BUILDLINK_API_DEPENDS.libcrack+=	libcrack>=2.7
+BUILDLINK_ABI_DEPENDS.libcrack+=	libcrack>=2.7nb1
 BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 .endif	# LIBCRACK_BUILDLINK3_MK
 
Index: ./security/libdes/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libdes/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./security/libdes/buildlink3.mk	12 Apr 2004 20:46:28 -0000	1.1
+++ ./security/libdes/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libdes
 
 .if !empty(LIBDES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libdes+=	libdes>=4.04b
+BUILDLINK_API_DEPENDS.libdes+=	libdes>=4.04b
 BUILDLINK_PKGSRCDIR.libdes?=	../../security/libdes
 BUILDLINK_DEPMETHOD.libdes?=	build
 .endif	# LIBDES_BUILDLINK3_MK
Index: ./security/libdes/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libdes/builtin.mk,v
retrieving revision 1.4
diff -u -r1.4 builtin.mk
--- ./security/libdes/builtin.mk	1 Jun 2005 18:03:21 -0000	1.4
+++ ./security/libdes/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.libdes) && \
         !empty(IS_BUILTIN.libdes:M[yY][eE][sS])
 USE_BUILTIN.libdes=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.libdes}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.libdes}
 .        if !empty(USE_BUILTIN.libdes:M[yY][eE][sS])
 USE_BUILTIN.libdes!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libdes:Q}; then	\
Index: ./security/libfwbuilder/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/libfwbuilder/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./security/libfwbuilder/Makefile	12 Mar 2006 06:56:30 -0000	1.19
+++ ./security/libfwbuilder/Makefile	4 Apr 2006 06:26:57 -0000
@@ -19,7 +19,7 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb5
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./security/libfwbuilder/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libfwbuilder/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./security/libfwbuilder/buildlink3.mk	3 Mar 2006 01:29:40 -0000	1.10
+++ ./security/libfwbuilder/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libfwbuilder
 
 .if !empty(LIBFWBUILDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
-BUILDLINK_RECOMMENDED.libfwbuilder?=	libfwbuilder>=2.0.10nb2
+BUILDLINK_API_DEPENDS.libfwbuilder+=	libfwbuilder>=2.0.10
+BUILDLINK_ABI_DEPENDS.libfwbuilder?=	libfwbuilder>=2.0.10nb2
 BUILDLINK_PKGSRCDIR.libfwbuilder?=	../../security/libfwbuilder
 .endif	# LIBFWBUILDER_BUILDLINK3_MK
 
Index: ./security/libgcrypt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libgcrypt/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./security/libgcrypt/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.9
+++ ./security/libgcrypt/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgcrypt
 
 .if !empty(LIBGCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
-BUILDLINK_RECOMMENDED.libgcrypt+=	libgcrypt>=1.2.2nb1
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.0
+BUILDLINK_ABI_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2nb1
 BUILDLINK_PKGSRCDIR.libgcrypt?=	../../security/libgcrypt
 .endif	# LIBGCRYPT_BUILDLINK3_MK
 
Index: ./security/libgpg-error/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libgpg-error/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./security/libgpg-error/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.8
+++ ./security/libgpg-error/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgpg-error
 
 .if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=0.6
-BUILDLINK_RECOMMENDED.libgpg-error+=	libgpg-error>=1.0nb1
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=0.6
+BUILDLINK_ABI_DEPENDS.libgpg-error+=	libgpg-error>=1.0nb1
 BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
 .endif	# LIBGPG_ERROR_BUILDLINK3_MK
 
Index: ./security/libidea/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libidea/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./security/libidea/buildlink3.mk	18 Apr 2004 18:48:41 -0000	1.1
+++ ./security/libidea/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libidea
 
 .if !empty(LIBIDEA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libidea+=	libidea>=0.8.2
+BUILDLINK_API_DEPENDS.libidea+=	libidea>=0.8.2
 BUILDLINK_PKGSRCDIR.libidea?=	../../security/libidea
 BUILDLINK_DEPMETHOD.libidea?=	build
 .endif	# LIBIDEA_BUILDLINK3_MK
Index: ./security/libident/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libident/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/libident/buildlink3.mk	3 Oct 2004 00:18:09 -0000	1.2
+++ ./security/libident/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libident
 
 .if !empty(LIBIDENT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libident+=	libident>=0.22
-BUILDLINK_RECOMMENDED.libident+=	libident>=0.22nb1
+BUILDLINK_API_DEPENDS.libident+=	libident>=0.22
+BUILDLINK_ABI_DEPENDS.libident+=	libident>=0.22nb1
 BUILDLINK_PKGSRCDIR.libident?=	../../security/libident
 .endif	# LIBIDENT_BUILDLINK3_MK
 
Index: ./security/libksba/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libksba/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./security/libksba/buildlink3.mk	5 Feb 2006 23:10:44 -0000	1.8
+++ ./security/libksba/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libksba
 
 .if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+=	libksba>=0.9.7
-BUILDLINK_RECOMMENDED.libksba+=	libksba>=0.9.13nb1
+BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.9.7
+BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba
 .endif	# LIBKSBA_BUILDLINK3_MK
 
Index: ./security/libksba04/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libksba04/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/libksba04/buildlink3.mk	3 Oct 2004 00:18:10 -0000	1.2
+++ ./security/libksba04/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libksba
 
 .if !empty(LIBKSBA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libksba+=	libksba>=0.4.7nb1
-BUILDLINK_RECOMMENDED.libksba+=	libksba>=0.4.7nb2
+BUILDLINK_API_DEPENDS.libksba+=	libksba>=0.4.7nb1
+BUILDLINK_ABI_DEPENDS.libksba+=	libksba>=0.4.7nb2
 BUILDLINK_PKGSRCDIR.libksba?=	../../security/libksba04
 .endif	# LIBKSBA_BUILDLINK3_MK
 
Index: ./security/libmcrypt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libmcrypt/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/libmcrypt/buildlink3.mk	3 Oct 2004 00:18:10 -0000	1.2
+++ ./security/libmcrypt/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libmcrypt
 
 .if !empty(LIBMCRYPT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmcrypt+=	libmcrypt>=2.5.6
-BUILDLINK_RECOMMENDED.libmcrypt+=	libmcrypt>=2.5.7nb1
+BUILDLINK_API_DEPENDS.libmcrypt+=	libmcrypt>=2.5.6
+BUILDLINK_ABI_DEPENDS.libmcrypt+=	libmcrypt>=2.5.7nb1
 BUILDLINK_PKGSRCDIR.libmcrypt?=	../../security/libmcrypt
 .endif	# LIBMCRYPT_BUILDLINK3_MK
 
Index: ./security/libnasl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libnasl/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/libnasl/buildlink3.mk	21 Feb 2005 10:08:43 -0000	1.5
+++ ./security/libnasl/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	libnasl
 
 .if !empty(LIBNASL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libnasl+=	libnasl>=2.2.3
-BUILDLINK_RECOMMENDED.libnasl?=	libnasl>=2.2.3
+BUILDLINK_API_DEPENDS.libnasl+=	libnasl>=2.2.3
+BUILDLINK_ABI_DEPENDS.libnasl?=	libnasl>=2.2.3
 BUILDLINK_PKGSRCDIR.libnasl?=	../../security/libnasl
 .endif	# LIBNASL_BUILDLINK3_MK
 
Index: ./security/libprelude/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libprelude/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./security/libprelude/buildlink3.mk	10 Mar 2006 22:19:29 -0000	1.4
+++ ./security/libprelude/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libprelude
 
 .if !empty(LIBPRELUDE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libprelude+=	libprelude>=0.9.0
-BUILDLINK_RECOMMENDED.libprelude?=	libprelude>=0.9.7
+BUILDLINK_API_DEPENDS.libprelude+=	libprelude>=0.9.0
+BUILDLINK_ABI_DEPENDS.libprelude?=	libprelude>=0.9.7
 BUILDLINK_PKGSRCDIR.libprelude?=	../../security/libprelude
 .endif	# LIBPRELUDE_BUILDLINK3_MK
 
Index: ./security/libpreludedb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/libpreludedb/buildlink3.mk	10 Mar 2006 22:44:50 -0000	1.5
+++ ./security/libpreludedb/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libpreludedb
 
 .if !empty(LIBPRELUDEDB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpreludedb+=	libpreludedb>=0.9.3
-BUILDLINK_RECOMMENDED.libpreludedb?=	libpreludedb>=0.9.6
+BUILDLINK_API_DEPENDS.libpreludedb+=	libpreludedb>=0.9.3
+BUILDLINK_ABI_DEPENDS.libpreludedb?=	libpreludedb>=0.9.6
 BUILDLINK_PKGSRCDIR.libpreludedb?=	../../security/libpreludedb
 .endif	# LIBPRELUDEDB_BUILDLINK3_MK
 
Index: ./security/libssh/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libssh/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/libssh/buildlink3.mk	5 Feb 2006 00:20:17 -0000	1.3
+++ ./security/libssh/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libssh
 
 .if !empty(LIBSSH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libssh+=	libssh>=0.11
+BUILDLINK_API_DEPENDS.libssh+=	libssh>=0.11
 BUILDLINK_PKGSRCDIR.libssh?=	../../security/libssh
 .endif	# LIBSSH_BUILDLINK3_MK
 
Index: ./security/libtasn1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libtasn1/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/libtasn1/buildlink3.mk	6 Mar 2006 00:18:10 -0000	1.5
+++ ./security/libtasn1/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtasn1
 
 .if !empty(LIBTASN1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtasn1+=	libtasn1>=0.2.7
-BUILDLINK_RECOMMENDED.libtasn1+=	libtasn1>=0.3.0
+BUILDLINK_API_DEPENDS.libtasn1+=	libtasn1>=0.2.7
+BUILDLINK_ABI_DEPENDS.libtasn1+=	libtasn1>=0.3.0
 BUILDLINK_PKGSRCDIR.libtasn1?=	../../security/libtasn1
 .endif	# LIBTASN1_BUILDLINK3_MK
 
Index: ./security/libtcpa/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/libtcpa/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./security/libtcpa/buildlink3.mk	26 Mar 2004 02:27:52 -0000	1.5
+++ ./security/libtcpa/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libtcpa
 
 .if !empty(LIBTCPA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libtcpa+=	libtcpa>=1.1b
-BUILDLINK_RECOMMENDED.libtcpa?=	libtcpa>=1.1bnb1
+BUILDLINK_API_DEPENDS.libtcpa+=	libtcpa>=1.1b
+BUILDLINK_ABI_DEPENDS.libtcpa?=	libtcpa>=1.1bnb1
 BUILDLINK_PKGSRCDIR.libtcpa?=	../../security/libtcpa
 BUILDLINK_DEPMETHOD.libtcpa?=	build
 .endif	# LIBTCPA_BUILDLINK3_MK
Index: ./security/mhash/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/mhash/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/mhash/buildlink3.mk	5 Feb 2006 23:10:45 -0000	1.3
+++ ./security/mhash/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mhash
 
 .if !empty(MHASH_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mhash+=	mhash>=0.8.3
-BUILDLINK_RECOMMENDED.mhash+=	mhash>=0.9.2nb1
+BUILDLINK_API_DEPENDS.mhash+=	mhash>=0.8.3
+BUILDLINK_ABI_DEPENDS.mhash+=	mhash>=0.9.2nb1
 BUILDLINK_PKGSRCDIR.mhash?=	../../security/mhash
 .endif	# MHASH_BUILDLINK3_MK
 
Index: ./security/mit-krb5/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/mit-krb5/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./security/mit-krb5/buildlink3.mk	16 Apr 2005 14:32:53 -0000	1.4
+++ ./security/mit-krb5/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	mit-krb5
 
 .if !empty(MIT_KRB5_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mit-krb5+=		mit-krb5>=1.3.1
-BUILDLINK_RECOMMENDED.mit-krb5+=	mit-krb5>=1.4nb1
+BUILDLINK_API_DEPENDS.mit-krb5+=		mit-krb5>=1.3.1
+BUILDLINK_ABI_DEPENDS.mit-krb5+=	mit-krb5>=1.4nb1
 BUILDLINK_PKGSRCDIR.mit-krb5?=		../../security/mit-krb5
 .endif	# MIT_KRB5_BUILDLINK3_MK
 
Index: ./security/mixminion/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/mixminion/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./security/mixminion/Makefile	5 Feb 2006 23:10:45 -0000	1.6
+++ ./security/mixminion/Makefile	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 HOMEPAGE=		http://mixminion.net/
 COMMENT=		Mixminion impedes message traffic analysis
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7d
 
 CRYPTO=				YES
 PYTHON_VERSIONS_ACCEPTED=       23 22 21
Index: ./security/nessus-core/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/nessus-core/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./security/nessus-core/buildlink3.mk	5 Feb 2006 23:10:45 -0000	1.6
+++ ./security/nessus-core/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nessus-core
 
 .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-core+=		nessus-core>=2.2.3
-BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.2.6
+BUILDLINK_API_DEPENDS.nessus-core+=		nessus-core>=2.2.3
+BUILDLINK_ABI_DEPENDS.nessus-core?=	nessus-core>=2.2.6
 BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
 .endif	# NESSUS_CORE_BUILDLINK3_MK
 
Index: ./security/nessus-libraries/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/nessus-libraries/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./security/nessus-libraries/buildlink3.mk	29 Jan 2006 17:05:54 -0000	1.8
+++ ./security/nessus-libraries/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	nessus-libraries
 
 .if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.3
+BUILDLINK_API_DEPENDS.nessus-libraries+=	nessus-libraries>=2.2.3
 BUILDLINK_PKGSRCDIR.nessus-libraries?=	../../security/nessus-libraries
 .endif	# NESSUS_LIBRARIES_BUILDLINK3_MK
 
Index: ./security/opencdk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/opencdk/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./security/opencdk/buildlink3.mk	5 Feb 2006 23:10:45 -0000	1.7
+++ ./security/opencdk/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	opencdk
 
 .if !empty(OPENCDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
-BUILDLINK_RECOMMENDED.opencdk+=	opencdk>=0.5.8nb1
+BUILDLINK_API_DEPENDS.opencdk+=	opencdk>=0.5.4nb1
+BUILDLINK_ABI_DEPENDS.opencdk+=	opencdk>=0.5.8nb1
 BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
 .endif	# OPENCDK_BUILDLINK3_MK
 
Index: ./security/openpam/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openpam/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./security/openpam/buildlink3.mk	13 Jan 2005 21:59:01 -0000	1.1
+++ ./security/openpam/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	openpam
 
 .if !empty(OPENPAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openpam+=	openpam>=20040210
+BUILDLINK_API_DEPENDS.openpam+=	openpam>=20040210
 BUILDLINK_PKGSRCDIR.openpam?=	../../security/openpam
 .endif	# OPENPAM_BUILDLINK3_MK
 
Index: ./security/openpam/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openpam/builtin.mk,v
retrieving revision 1.4
diff -u -r1.4 builtin.mk
--- ./security/openpam/builtin.mk	9 Jun 2005 06:07:29 -0000	1.4
+++ ./security/openpam/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -45,7 +45,7 @@
 .    if defined(BUILTIN_PKG.openpam) && \
         !empty(IS_BUILTIN.openpam:M[yY][eE][sS])
 USE_BUILTIN.openpam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.openpam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.openpam}
 .        if !empty(USE_BUILTIN.openpam:M[yY][eE][sS])
 USE_BUILTIN.openpam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openpam:Q}; then \
Index: ./security/openssl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/buildlink3.mk,v
retrieving revision 1.29
diff -u -r1.29 buildlink3.mk
--- ./security/openssl/buildlink3.mk	5 Feb 2006 23:10:45 -0000	1.29
+++ ./security/openssl/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	openssl
 
 .if !empty(OPENSSL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.6m
-BUILDLINK_RECOMMENDED.openssl+=	openssl>=0.9.7inb1
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.6m
+BUILDLINK_ABI_DEPENDS.openssl+=	openssl>=0.9.7inb1
 BUILDLINK_PKGSRCDIR.openssl?=	../../security/openssl
 
 # Ensure that -lcrypt comes before -lcrypto when linking so that the
Index: ./security/openssl/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/builtin.mk,v
retrieving revision 1.17
diff -u -r1.17 builtin.mk
--- ./security/openssl/builtin.mk	12 Oct 2005 02:20:10 -0000	1.17
+++ ./security/openssl/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -110,7 +110,7 @@
 .    if defined(BUILTIN_PKG.openssl) && \
         !empty(IS_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.openssl}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.openssl}
 .        if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 USE_BUILTIN.openssl!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \
Index: ./security/p5-Net-DNS-SEC/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/p5-Net-DNS-SEC/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./security/p5-Net-DNS-SEC/Makefile	29 Dec 2005 06:22:11 -0000	1.13
+++ ./security/p5-Net-DNS-SEC/Makefile	4 Apr 2006 06:26:57 -0000
@@ -20,7 +20,7 @@
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
 
-BUILDLINK_DEPENDS.perl+=	perl>=5.6.1
+BUILDLINK_API_DEPENDS.perl+=	perl>=5.6.1
 
 PERL5_PACKLIST=		auto/Net/DNS/SEC/.packlist
 
Index: ./security/pakemon/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pakemon/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./security/pakemon/Makefile	4 Mar 2006 21:30:37 -0000	1.21
+++ ./security/pakemon/Makefile	4 Apr 2006 06:26:57 -0000
@@ -13,7 +13,7 @@
 
 GNU_CONFIGURE=	yes
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
 post-extract:
 	${CP} ${WRKSRC}/pakemon.h ${WRKSRC}/pakemon.h.in
Index: ./security/pflkm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/pflkm/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/pflkm/buildlink3.mk	7 Mar 2006 19:11:54 -0000	1.2
+++ ./security/pflkm/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	pflkm
 
 .if !empty(PFLKM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pflkm+=	pflkm>=20040501
+BUILDLINK_API_DEPENDS.pflkm+=	pflkm>=20040501
 BUILDLINK_PKGSRCDIR.pflkm?=	../../security/pflkm
 .endif	# PFLKM_BUILDLINK3_MK
 
Index: ./security/pflkm/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/pflkm/builtin.mk,v
retrieving revision 1.7
diff -u -r1.7 builtin.mk
--- ./security/pflkm/builtin.mk	7 Dec 2005 12:06:26 -0000	1.7
+++ ./security/pflkm/builtin.mk	4 Apr 2006 06:26:57 -0000
@@ -78,7 +78,7 @@
 .    if defined(BUILTIN_PKG.pflkm) && \
         !empty(IS_BUILTIN.pflkm:M[yY][eE][sS])
 USE_BUILTIN.pflkm=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.pflkm}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.pflkm}
 .        if !empty(USE_BUILTIN.pflkm:M[yY][eE][sS])
 USE_BUILTIN.pflkm!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.pflkm:Q}; then	\
Index: ./security/pinentry/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./security/pinentry/Makefile	5 Feb 2006 23:10:46 -0000	1.10
+++ ./security/pinentry/Makefile	4 Apr 2006 06:26:57 -0000
@@ -38,7 +38,7 @@
 PLIST_SUBST+=		USE_QT='@comment '
 .endif
 
-BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
Index: ./security/pinentry/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/pinentry/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./security/pinentry/buildlink3.mk	5 Feb 2006 23:10:46 -0000	1.2
+++ ./security/pinentry/buildlink3.mk	4 Apr 2006 06:26:57 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pinentry
 
 .if !empty(PINENTRY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pinentry+=	pinentry>=0.7.1
-BUILDLINK_RECOMMENDED.pinentry?=	pinentry>=0.7.1nb3
+BUILDLINK_API_DEPENDS.pinentry+=	pinentry>=0.7.1
+BUILDLINK_ABI_DEPENDS.pinentry?=	pinentry>=0.7.1nb3
 BUILDLINK_PKGSRCDIR.pinentry?=	../../security/pinentry
 .endif	# PINENTRY_BUILDLINK3_MK
 
Index: ./security/qca/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/qca/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./security/qca/Makefile	13 Mar 2006 21:56:22 -0000	1.10
+++ ./security/qca/Makefile	4 Apr 2006 06:26:58 -0000
@@ -17,6 +17,6 @@
 INSTALLATION_DIRS=	include lib
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./security/qca/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/qca/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/qca/buildlink3.mk	5 Feb 2006 23:10:47 -0000	1.3
+++ ./security/qca/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qca
 
 .if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qca+=	qca>=1.0
-BUILDLINK_RECOMMENDED.qca?=	qca>=1.0nb2
+BUILDLINK_API_DEPENDS.qca+=	qca>=1.0
+BUILDLINK_ABI_DEPENDS.qca?=	qca>=1.0nb2
 BUILDLINK_PKGSRCDIR.qca?=	../../security/qca
 .endif	# QCA_BUILDLINK3_MK
 
Index: ./security/py-m2crypto/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/py-m2crypto/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./security/py-m2crypto/Makefile	4 Mar 2006 21:30:38 -0000	1.18
+++ ./security/py-m2crypto/Makefile	4 Apr 2006 06:26:58 -0000
@@ -22,7 +22,7 @@
 # it seems, and 0.9.7i is the version which currently is
 # in pkgsrc and against which I fixed m2crypto to compile.
 # -- wiz 20060115
-BUILDLINK_DEPENDS.openssl+=	openssl-0.9.7i{,nb*}
+BUILDLINK_API_DEPENDS.openssl+=	openssl-0.9.7i{,nb*}
 
 .include "../../lang/python/extension.mk"
 .include "../../devel/swig/buildlink3.mk"
Index: ./security/qca-tls/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/qca-tls/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./security/qca-tls/Makefile	13 Mar 2006 21:56:22 -0000	1.15
+++ ./security/qca-tls/Makefile	4 Apr 2006 06:26:58 -0000
@@ -19,6 +19,6 @@
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./security/rsaref/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/rsaref/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./security/rsaref/buildlink3.mk	3 Oct 2004 19:59:38 -0000	1.7
+++ ./security/rsaref/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	rsaref
 
 .if !empty(RSAREF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.rsaref+=	rsaref>=2.0p3
-BUILDLINK_RECOMMENDED.rsaref+=	rsaref>=2.0p3nb1
+BUILDLINK_API_DEPENDS.rsaref+=	rsaref>=2.0p3
+BUILDLINK_ABI_DEPENDS.rsaref+=	rsaref>=2.0p3nb1
 BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 .endif	# RSAREF_BUILDLINK3_MK
 
Index: ./security/seahorse/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/seahorse/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- ./security/seahorse/Makefile	21 Mar 2006 06:00:48 -0000	1.52
+++ ./security/seahorse/Makefile	4 Apr 2006 06:26:58 -0000
@@ -25,7 +25,7 @@
 
 GCONF2_SCHEMAS= 	seahorse.schemas
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
Index: ./security/seahorse/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/seahorse/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./security/seahorse/buildlink3.mk	14 Mar 2006 15:00:57 -0000	1.1
+++ ./security/seahorse/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -21,7 +21,7 @@
 BUILDLINK_PACKAGES+=	seahorse
 
 .if !empty(SEAHORSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.seahorse+=	seahorse>=0.8.1
+BUILDLINK_API_DEPENDS.seahorse+=	seahorse>=0.8.1
 BUILDLINK_PKGSRCDIR.seahorse?=	../../security/seahorse
 .endif	# SEAHORSE_BUILDLINK3_MK
 
Index: ./security/seahorse-gedit/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/seahorse-gedit/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./security/seahorse-gedit/Makefile	21 Mar 2006 06:00:48 -0000	1.2
+++ ./security/seahorse-gedit/Makefile	4 Apr 2006 06:26:58 -0000
@@ -26,7 +26,7 @@
 
 GCONF2_SCHEMAS= 	seahorse-gedit.schemas
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 BUILD_DIRS=	plugins/gedit
 INSTALL_DIRS=	plugins/gedit
Index: ./security/seahorse-nautilus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/seahorse-nautilus/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ./security/seahorse-nautilus/Makefile	21 Mar 2006 06:00:49 -0000	1.2
+++ ./security/seahorse-nautilus/Makefile	4 Apr 2006 06:26:58 -0000
@@ -24,7 +24,7 @@
 
 CONFIGURE_ARGS+=	--disable-gedit
 
-BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
+BUILDLINK_API_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 
 BUILD_DIRS=	plugins/nautilus-ext
 INSTALL_DIRS=	plugins/nautilus-ext
Index: ./security/skey/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/skey/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./security/skey/buildlink3.mk	5 Feb 2006 23:10:47 -0000	1.3
+++ ./security/skey/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	skey
 
 .if !empty(SKEY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.skey+=	skey>=1.1.5
-BUILDLINK_RECOMMENDED.skey?=	skey>=1.1.5nb2
+BUILDLINK_API_DEPENDS.skey+=	skey>=1.1.5
+BUILDLINK_ABI_DEPENDS.skey?=	skey>=1.1.5nb2
 BUILDLINK_PKGSRCDIR.skey?=	../../security/skey
 BUILDLINK_DEPMETHOD.skey?=	build
 .endif	# SKEY_BUILDLINK3_MK
Index: ./security/skey/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/skey/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./security/skey/builtin.mk	1 Jun 2005 18:03:21 -0000	1.2
+++ ./security/skey/builtin.mk	4 Apr 2006 06:26:58 -0000
@@ -45,7 +45,7 @@
 .    if defined(BUILTIN_PKG.skey) && \
         !empty(IS_BUILTIN.skey:M[yY][eE][sS])
 USE_BUILTIN.skey=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.skey}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.skey}
 .        if !empty(USE_BUILTIN.skey:M[yY][eE][sS])
 USE_BUILTIN.skey!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.skey:Q}; then	\
Index: ./security/tcl-tls/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/tcl-tls/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./security/tcl-tls/buildlink3.mk	22 Jan 2005 19:45:23 -0000	1.1.1.1
+++ ./security/tcl-tls/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	tcl-tls
 
 .if !empty(TCL_TLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl-tls+=	tcl-tls>=1.5.0
+BUILDLINK_API_DEPENDS.tcl-tls+=	tcl-tls>=1.5.0
 BUILDLINK_PKGSRCDIR.tcl-tls?=	../../security/tcl-tls
 .endif	# TCL_TLS_BUILDLINK3_MK
 
Index: ./security/tcp_wrappers/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/tcp_wrappers/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./security/tcp_wrappers/buildlink3.mk	18 Oct 2005 04:32:01 -0000	1.8
+++ ./security/tcp_wrappers/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tcp_wrappers
 
 .if !empty(TCP_WRAPPERS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
-BUILDLINK_RECOMMENDED.tcp_wrappers+=	tcp_wrappers>=7.6.1nb3
+BUILDLINK_API_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb1
+BUILDLINK_ABI_DEPENDS.tcp_wrappers+=	tcp_wrappers>=7.6.1nb3
 BUILDLINK_PKGSRCDIR.tcp_wrappers?=	../../security/tcp_wrappers
 .endif	# TCP_WRAPPERS_BUILDLINK3_MK
 
Index: ./security/tcp_wrappers/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/tcp_wrappers/builtin.mk,v
retrieving revision 1.6
diff -u -r1.6 builtin.mk
--- ./security/tcp_wrappers/builtin.mk	1 Jun 2005 18:03:21 -0000	1.6
+++ ./security/tcp_wrappers/builtin.mk	4 Apr 2006 06:26:58 -0000
@@ -34,7 +34,7 @@
 .    if defined(BUILTIN_PKG.tcp_wrappers) && \
         !empty(IS_BUILTIN.tcp_wrappers:M[yY][eE][sS])
 USE_BUILTIN.tcp_wrappers=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.tcp_wrappers}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.tcp_wrappers}
 .        if !empty(USE_BUILTIN.tcp_wrappers:M[yY][eE][sS])
 USE_BUILTIN.tcp_wrappers!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.tcp_wrappers:Q}; then \
Index: ./security/tinyca/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/tinyca/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./security/tinyca/Makefile	5 Feb 2006 23:10:47 -0000	1.7
+++ ./security/tinyca/Makefile	4 Apr 2006 06:26:58 -0000
@@ -21,7 +21,7 @@
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	tinyca
 
-BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7d
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7d
 
 SUBST_CLASSES+=		script
 SUBST_STAGE.script=	post-patch
Index: ./shells/bash/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/bash/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./shells/bash/Makefile	30 Mar 2006 03:44:44 -0000	1.21
+++ ./shells/bash/Makefile	4 Apr 2006 06:26:58 -0000
@@ -73,7 +73,7 @@
 CONFIGURE_ARGS+=		--with-installed-readline
 
 USE_GNU_READLINE=		yes
-BUILDLINK_DEPENDS.readline+=	readline>=4.3
+BUILDLINK_API_DEPENDS.readline+=	readline>=4.3
 
 .include "../../devel/readline/buildlink3.mk"
 .endif
Index: ./shells/bash2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/shells/bash2/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- ./shells/bash2/Makefile	5 Feb 2006 23:10:47 -0000	1.71
+++ ./shells/bash2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -55,7 +55,7 @@
 CONFIGURE_ENV+=	ac_cv_type_wctype_t=no
 .endif
 
-BUILDLINK_DEPENDS.readline+=	readline>=4.3
+BUILDLINK_API_DEPENDS.readline+=	readline>=4.3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
Index: ./sysutils/amanda-common/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/amanda-common/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./sysutils/amanda-common/buildlink3.mk	5 Feb 2006 23:10:48 -0000	1.6
+++ ./sysutils/amanda-common/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	amanda-common
 
 .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb2
-BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p4nb3
+BUILDLINK_API_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb2
+BUILDLINK_ABI_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4nb3
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
 .endif	# AMANDA_COMMON_BUILDLINK3_MK
 
Index: ./sysutils/dbus/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- ./sysutils/dbus/Makefile.common	11 Feb 2006 14:30:29 -0000	1.12
+++ ./sysutils/dbus/Makefile.common	4 Apr 2006 06:26:58 -0000
@@ -72,7 +72,7 @@
 SUBST_FILES.paths+=	${f}/Makefile.in
 .  endfor
 
-BUILDLINK_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
 .  include "../../sysutils/dbus/buildlink3.mk"
 .endif
 
Index: ./sysutils/dbus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./sysutils/dbus/buildlink3.mk	5 Feb 2006 23:10:49 -0000	1.4
+++ ./sysutils/dbus/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	dbus
 
 .if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus+=	dbus>=0.23.4
-BUILDLINK_RECOMMENDED.dbus?=	dbus>=0.23.4nb2
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=0.23.4
+BUILDLINK_ABI_DEPENDS.dbus?=	dbus>=0.23.4nb2
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 .endif	# DBUS_BUILDLINK3_MK
 
Index: ./sysutils/dbus-glib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/dbus-glib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./sysutils/dbus-glib/buildlink3.mk	5 Feb 2006 23:10:49 -0000	1.5
+++ ./sysutils/dbus-glib/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	dbus-glib
 
 .if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dbus-glib+=	dbus-glib>=0.23.4
-BUILDLINK_RECOMMENDED.dbus-glib?=	dbus-glib>=0.23.4nb2
+BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.23.4
+BUILDLINK_ABI_DEPENDS.dbus-glib?=	dbus-glib>=0.23.4nb2
 BUILDLINK_PKGSRCDIR.dbus-glib?=	../../sysutils/dbus-glib
 .endif	# DBUS_GLIB_BUILDLINK3_MK
 
Index: ./sysutils/desktop-file-utils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/desktop-file-utils/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./sysutils/desktop-file-utils/buildlink3.mk	5 Feb 2006 23:10:49 -0000	1.2
+++ ./sysutils/desktop-file-utils/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	desktop-file-utils
 
 .if !empty(DESKTOP_FILE_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.8
-BUILDLINK_RECOMMENDED.desktop-file-utils+=	desktop-file-utils>=0.10nb1
+BUILDLINK_API_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.8
+BUILDLINK_ABI_DEPENDS.desktop-file-utils+=	desktop-file-utils>=0.10nb1
 BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils
 .endif	# DESKTOP_FILE_UTILS_BUILDLINK3_MK
 
Index: ./sysutils/duplicity/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/duplicity/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./sysutils/duplicity/Makefile	4 Mar 2006 21:30:40 -0000	1.7
+++ ./sysutils/duplicity/Makefile	4 Apr 2006 06:26:58 -0000
@@ -12,7 +12,7 @@
 
 DEPENDS+=		gnupg>=1.2.3:../../security/gnupg
 
-BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 PYDISTUTILSPKG=		yes
 PYTHON_VERSIONS_ACCEPTED= 22 23
 
Index: ./sysutils/fam/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/fam/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./sysutils/fam/buildlink3.mk	5 Feb 2006 23:10:49 -0000	1.4
+++ ./sysutils/fam/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fam
 
 .if !empty(FAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fam+=		fam>=2.6.10
-BUILDLINK_RECOMMENDED.fam+=	fam>=2.7.0nb7
+BUILDLINK_API_DEPENDS.fam+=		fam>=2.6.10
+BUILDLINK_ABI_DEPENDS.fam+=	fam>=2.7.0nb7
 BUILDLINK_PKGSRCDIR.fam?=	../../sysutils/fam
 .endif	# FAM_BUILDLINK3_MK
 
Index: ./sysutils/fam/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/fam/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./sysutils/fam/builtin.mk	1 Jun 2005 18:03:21 -0000	1.2
+++ ./sysutils/fam/builtin.mk	4 Apr 2006 06:26:58 -0000
@@ -31,7 +31,7 @@
 .    if defined(BUILTIN_PKG.fam) && \
         !empty(IS_BUILTIN.fam:M[yY][eE][sS])
 USE_BUILTIN.fam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.fam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.fam}
 .        if !empty(USE_BUILTIN.fam:M[yY][eE][sS])
 USE_BUILTIN.fam!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fam:Q}; then	\
Index: ./sysutils/file/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./sysutils/file/buildlink3.mk	3 Oct 2004 00:18:14 -0000	1.2
+++ ./sysutils/file/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	file
 
 .if !empty(FILE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.file+=	file>=4.09
-BUILDLINK_RECOMMENDED.file+=	file>=4.09nb1
+BUILDLINK_API_DEPENDS.file+=	file>=4.09
+BUILDLINK_ABI_DEPENDS.file+=	file>=4.09nb1
 BUILDLINK_PKGSRCDIR.file?=	../../sysutils/file
 .endif	# FILE_BUILDLINK3_MK
 
Index: ./sysutils/file/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/file/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./sysutils/file/builtin.mk	1 Jun 2005 18:03:21 -0000	1.2
+++ ./sysutils/file/builtin.mk	4 Apr 2006 06:26:58 -0000
@@ -32,7 +32,7 @@
 .    if defined(BUILTIN_PKG.file) && \
         !empty(IS_BUILTIN.file:M[yY][eE][sS])
 USE_BUILTIN.file=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.file}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.file}
 .        if !empty(USE_BUILTIN.file:M[yY][eE][sS])
 USE_BUILTIN.file!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.file:Q}; then	\
Index: ./sysutils/gamin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gamin/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./sysutils/gamin/buildlink3.mk	5 Feb 2006 23:10:50 -0000	1.2
+++ ./sysutils/gamin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gamin
 
 .if !empty(GAMIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gamin+=	gamin>=0.1.5
-BUILDLINK_RECOMMENDED.gamin?=	gamin>=0.1.5nb2
+BUILDLINK_API_DEPENDS.gamin+=	gamin>=0.1.5
+BUILDLINK_ABI_DEPENDS.gamin?=	gamin>=0.1.5nb2
 BUILDLINK_PKGSRCDIR.gamin?=	../../sysutils/gamin
 .endif	# GAMIN_BUILDLINK3_MK
 
Index: ./sysutils/gkrellm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./sysutils/gkrellm/buildlink3.mk	5 Feb 2006 23:10:50 -0000	1.8
+++ ./sysutils/gkrellm/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gkrellm
 
 .if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm>=2.1.22
-BUILDLINK_RECOMMENDED.gkrellm?=	gkrellm>=2.2.7nb2
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.1.22
+BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=2.2.7nb2
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm
 .endif	# GKRELLM_BUILDLINK3_MK
 
Index: ./sysutils/gkrellm1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gkrellm1/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./sysutils/gkrellm1/buildlink3.mk	5 Feb 2006 23:10:50 -0000	1.4
+++ ./sysutils/gkrellm1/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gkrellm
 
 .if !empty(GKRELLM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gkrellm+=	gkrellm<2.0
-BUILDLINK_RECOMMENDED.gkrellm?=	gkrellm>=1.2.13nb5
+BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm<2.0
+BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=1.2.13nb5
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm1
 .endif	# GKRELLM_BUILDLINK3_MK
 
Index: ./sysutils/gnome-menus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-menus/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./sysutils/gnome-menus/Makefile	6 Mar 2006 00:18:11 -0000	1.15
+++ ./sysutils/gnome-menus/Makefile	4 Apr 2006 06:26:58 -0000
@@ -37,8 +37,8 @@
 SUBST_SED.paths=	-e 's|/usr/|${PREFIX}/|g'
 SUBST_SED.paths+=	-e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g'
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./sysutils/gnome-menus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-menus/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./sysutils/gnome-menus/buildlink3.mk	5 Feb 2006 23:10:50 -0000	1.5
+++ ./sysutils/gnome-menus/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-menus
 
 .if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.12.0
-BUILDLINK_RECOMMENDED.gnome-menus?=	gnome-menus>=2.12.0nb3
+BUILDLINK_API_DEPENDS.gnome-menus+=		gnome-menus>=2.12.0
+BUILDLINK_ABI_DEPENDS.gnome-menus?=	gnome-menus>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
Index: ./sysutils/gnome-vfs/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- ./sysutils/gnome-vfs/Makefile	5 Feb 2006 23:10:51 -0000	1.55
+++ ./sysutils/gnome-vfs/Makefile	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 
 BROKEN_GETTEXT_DETECTION=	yes
 BUILD_USES_MSGFMT=	YES
-BUILDLINK_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
+BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
 
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
Index: ./sysutils/gnome-vfs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./sysutils/gnome-vfs/buildlink3.mk	5 Feb 2006 23:10:53 -0000	1.10
+++ ./sysutils/gnome-vfs/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-vfs
 
 .if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb7
-BUILDLINK_RECOMMENDED.gnome-vfs+=	gnome-vfs>=1.0.5nb10
+BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb7
+BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=1.0.5nb10
 BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
 .endif	# GNOME_VFS_BUILDLINK3_MK
 
Index: ./sysutils/gnome-vfs2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs2/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- ./sysutils/gnome-vfs2/Makefile	29 Mar 2006 20:41:12 -0000	1.59
+++ ./sysutils/gnome-vfs2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -17,7 +17,7 @@
 
 LDFLAGS.Darwin+=	-lresolv
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "Makefile.common"
 PKGREVISION=	5
Index: ./sysutils/gnome-vfs2/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs2/Makefile.common,v
retrieving revision 1.29
diff -u -r1.29 Makefile.common
--- ./sysutils/gnome-vfs2/Makefile.common	20 Jan 2006 13:29:13 -0000	1.29
+++ ./sysutils/gnome-vfs2/Makefile.common	4 Apr 2006 06:26:58 -0000
@@ -82,7 +82,7 @@
 SUBST_FILES.libs=       modules/Makefile.in
 SUBST_SED.libs=         -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.1.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.1.1
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
Index: ./sysutils/gnome-vfs2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs2/buildlink3.mk,v
retrieving revision 1.19
diff -u -r1.19 buildlink3.mk
--- ./sysutils/gnome-vfs2/buildlink3.mk	5 Feb 2006 23:10:54 -0000	1.19
+++ ./sysutils/gnome-vfs2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-vfs2
 
 .if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.8.0
-BUILDLINK_RECOMMENDED.gnome-vfs2+=	gnome-vfs2>=2.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
Index: ./sysutils/gnome-vfsmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfsmm/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./sysutils/gnome-vfsmm/buildlink3.mk	5 Feb 2006 23:10:54 -0000	1.4
+++ ./sysutils/gnome-vfsmm/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-vfsmm
 
 .if !empty(GNOME_VFSMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
-BUILDLINK_RECOMMENDED.gnome-vfsmm?=	gnome-vfsmm>=2.12.0nb3
+BUILDLINK_API_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
+BUILDLINK_ABI_DEPENDS.gnome-vfsmm?=	gnome-vfsmm>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.gnome-vfsmm?=	../../sysutils/gnome-vfsmm
 .endif	# GNOME_VFSMM_BUILDLINK3_MK
 
Index: ./sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk	5 Feb 2006 23:10:54 -0000	1.3
+++ ./sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gst-plugins0.8-gnomevfs
 
 .if !empty(GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins0.8-gnomevfs+=	gst-plugins0.8-gnomevfs>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-gnomevfs?=	gst-plugins0.8-gnomevfs>=0.8.11nb2
+BUILDLINK_API_DEPENDS.gst-plugins0.8-gnomevfs+=	gst-plugins0.8-gnomevfs>=0.8.11
+BUILDLINK_ABI_DEPENDS.gst-plugins0.8-gnomevfs?=	gst-plugins0.8-gnomevfs>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-gnomevfs?=	../../sysutils/gst-plugins0.8-gnomevfs
 .endif	# GST_PLUGINS0.8_GNOMEVFS_BUILDLINK3_MK
 
Index: ./sysutils/libgtop2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/libgtop2/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./sysutils/libgtop2/Makefile	30 Mar 2006 03:44:44 -0000	1.33
+++ ./sysutils/libgtop2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -93,7 +93,7 @@
 .endif
 .undef statvfs_h
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
Index: ./sysutils/libgtop2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/libgtop2/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./sysutils/libgtop2/buildlink3.mk	5 Feb 2006 23:10:55 -0000	1.7
+++ ./sysutils/libgtop2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgtop2
 
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.12.0
-BUILDLINK_RECOMMENDED.libgtop2?=	libgtop2>=2.12.0nb3
+BUILDLINK_API_DEPENDS.libgtop2+=	libgtop2>=2.12.0
+BUILDLINK_ABI_DEPENDS.libgtop2?=	libgtop2>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.libgtop2?=	../../sysutils/libgtop2
 .endif	# LIBGTOP2_BUILDLINK3_MK
 
Index: ./sysutils/libol/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/libol/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./sysutils/libol/buildlink3.mk	6 Feb 2006 18:31:23 -0000	1.5
+++ ./sysutils/libol/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	libol
 
 .if !empty(LIBOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libol+=	libol>=0.3.17
+BUILDLINK_API_DEPENDS.libol+=	libol>=0.3.17
 BUILDLINK_PKGSRCDIR.libol?=	../../sysutils/libol
 .endif	# LIBOL_BUILDLINK3_MK
 
Index: ./sysutils/medusa/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/medusa/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./sysutils/medusa/buildlink3.mk	5 Feb 2006 23:10:55 -0000	1.5
+++ ./sysutils/medusa/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	medusa
 
 .if !empty(MEDUSA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.medusa+=	medusa>=0.5.1nb7
-BUILDLINK_RECOMMENDED.medusa?=	medusa>=0.5.1nb9
+BUILDLINK_API_DEPENDS.medusa+=	medusa>=0.5.1nb7
+BUILDLINK_ABI_DEPENDS.medusa?=	medusa>=0.5.1nb9
 BUILDLINK_PKGSRCDIR.medusa?=	../../sysutils/medusa
 .endif	# MEDUSA_BUILDLINK3_MK
 
Index: ./sysutils/nautilus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/nautilus/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- ./sysutils/nautilus/Makefile	21 Mar 2006 06:00:49 -0000	1.63
+++ ./sysutils/nautilus/Makefile	4 Apr 2006 06:26:58 -0000
@@ -25,10 +25,10 @@
 
 GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 
-BUILDLINK_DEPENDS.eel2+=	eel2>=2.12.0
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.1.1nb2
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
+BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.12.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.12.1.1nb2
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
Index: ./sysutils/nautilus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/nautilus/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./sysutils/nautilus/buildlink3.mk	5 Feb 2006 23:10:56 -0000	1.15
+++ ./sysutils/nautilus/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nautilus
 
 .if !empty(NAUTILUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus?=	nautilus>=2.12.2nb2
+BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus?=	nautilus>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus$$/ \
Index: ./sysutils/nautilus-cd-burner/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/nautilus-cd-burner/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./sysutils/nautilus-cd-burner/buildlink3.mk	6 Mar 2006 00:18:14 -0000	1.6
+++ ./sysutils/nautilus-cd-burner/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	nautilus-cd-burner
 
 .if !empty(NAUTILUS_CD_BURNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.12.1nb1
-BUILDLINK_RECOMMENDED.nautilus-cd-burner?=	nautilus-cd-burner>=2.12.3
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+=		nautilus-cd-burner>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.nautilus-cd-burner?=	nautilus-cd-burner>=2.12.3
 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?=	../../sysutils/nautilus-cd-burner
 .endif	# NAUTILUS_CD_BURNER_BUILDLINK3_MK
 
Index: ./sysutils/pciutils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/pciutils/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./sysutils/pciutils/buildlink3.mk	5 Feb 2006 23:10:56 -0000	1.2
+++ ./sysutils/pciutils/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pciutils
 
 .if !empty(PCIUTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pciutils+=	pciutils>=2.1.11
-BUILDLINK_RECOMMENDED.pciutils?=	pciutils>=2.1.11nb1
+BUILDLINK_API_DEPENDS.pciutils+=	pciutils>=2.1.11
+BUILDLINK_ABI_DEPENDS.pciutils?=	pciutils>=2.1.11nb1
 BUILDLINK_PKGSRCDIR.pciutils?=	../../sysutils/pciutils
 BUILDLINK_DEPMETHOD.pciutils?=	build
 .endif	# PCIUTILS_BUILDLINK3_MK
Index: ./sysutils/py-dbus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/py-dbus/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./sysutils/py-dbus/buildlink3.mk	22 Feb 2006 21:01:00 -0000	1.2
+++ ./sysutils/py-dbus/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	py-dbus
 
 .if !empty(PY_DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
-BUILDLINK_RECOMMENDED.py-dbus?=	${PYPKGPREFIX}-dbus>=0.23.4nb2
+BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.23.4
+BUILDLINK_ABI_DEPENDS.py-dbus?=	${PYPKGPREFIX}-dbus>=0.23.4nb2
 BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
 .endif	# PY_DBUS_BUILDLINK3_MK
 
Index: ./sysutils/rdiff-backup/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/rdiff-backup/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./sysutils/rdiff-backup/Makefile	4 Mar 2006 21:30:42 -0000	1.23
+++ ./sysutils/rdiff-backup/Makefile	4 Apr 2006 06:26:58 -0000
@@ -19,7 +19,7 @@
 SUBST_SED.path=		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 SUBST_MESSAGE.path=	"Fixing paths."
 
-BUILDLINK_DEPENDS.librsync+=	librsync>=0.9.6
+BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 
 .include "../../devel/librsync/buildlink3.mk"
 .include "../../lang/python/application.mk"
Index: ./sysutils/vcdimager-devel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/vcdimager-devel/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- ./sysutils/vcdimager-devel/Makefile	5 Feb 2006 23:10:57 -0000	1.32
+++ ./sysutils/vcdimager-devel/Makefile	4 Apr 2006 06:26:58 -0000
@@ -22,7 +22,7 @@
 BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver
 .endif
 
-BUILDLINK_DEPENDS.libcdio+=	libcdio>=0.72
+BUILDLINK_API_DEPENDS.libcdio+=	libcdio>=0.72
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
Index: ./sysutils/vcdimager-devel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/vcdimager-devel/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./sysutils/vcdimager-devel/buildlink3.mk	5 Feb 2006 23:10:57 -0000	1.3
+++ ./sysutils/vcdimager-devel/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	vcdimager
 
 .if !empty(VCDIMAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vcdimager+=	vcdimager>=0.7.20
-BUILDLINK_RECOMMENDED.vcdimager+=	vcdimager>=0.7.23nb1
+BUILDLINK_API_DEPENDS.vcdimager+=	vcdimager>=0.7.20
+BUILDLINK_ABI_DEPENDS.vcdimager+=	vcdimager>=0.7.23nb1
 BUILDLINK_PKGSRCDIR.vcdimager?=	../../sysutils/vcdimager-devel
 .endif	# VCDIMAGER_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-appfinder/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-appfinder/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./sysutils/xfce4-appfinder/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.7
+++ ./sysutils/xfce4-appfinder/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-appfinder
 
 .if !empty(XFCE4_APPFINDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-appfinder?=	xfce4-appfinder>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-appfinder+=	xfce4-appfinder>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-appfinder?=	xfce4-appfinder>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-appfinder?=	../../sysutils/xfce4-appfinder
 .endif	# XFCE4_APPFINDER_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-cpugraph-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-cpugraph-plugin/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./sysutils/xfce4-cpugraph-plugin/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.6
+++ ./sysutils/xfce4-cpugraph-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-cpugraph-plugin
 
 .if !empty(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb1
-BUILDLINK_RECOMMENDED.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.2.2nb3
+BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.2.2nb3
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
 .endif	# XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-fm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-fm/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./sysutils/xfce4-fm/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.11
+++ ./sysutils/xfce4-fm/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-fm
 
 .if !empty(XFCE4_FM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-fm?=	xfce4-fm>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-fm+=	xfce4-fm>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-fm?=	xfce4-fm>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-fm?=	../../sysutils/xfce4-fm
 .endif	# XFCE4_FM_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-diskperf-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-diskperf-plugin/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./sysutils/xfce4-diskperf-plugin/buildlink3.mk	17 Feb 2006 06:49:24 -0000	1.7
+++ ./sysutils/xfce4-diskperf-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
 
 .if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5
-BUILDLINK_RECOMMENDED.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=1.5nb2
+BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.5
+BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=1.5nb2
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
 .endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-fsguard-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-fsguard-plugin/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./sysutils/xfce4-fsguard-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.4
+++ ./sysutils/xfce4-fsguard-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-fsguard-plugin
 
 .if !empty(XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1
-BUILDLINK_RECOMMENDED.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.2.1nb2
+BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.2.1
+BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.2.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
 .endif	# XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-minicmd-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-minicmd-plugin/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./sysutils/xfce4-minicmd-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.9
+++ ./sysutils/xfce4-minicmd-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-minicmd-plugin
 
 .if !empty(XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0
-BUILDLINK_RECOMMENDED.xfce4-minicmd-plugin?=	xfce4-minicmd-plugin>=0.3.0nb2
+BUILDLINK_API_DEPENDS.xfce4-minicmd-plugin+=	xfce4-minicmd-plugin>=0.3.0
+BUILDLINK_ABI_DEPENDS.xfce4-minicmd-plugin?=	xfce4-minicmd-plugin>=0.3.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=	../../sysutils/xfce4-minicmd-plugin
 .endif	# XFCE4_MINICMD_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-netload-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-netload-plugin/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./sysutils/xfce4-netload-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.10
+++ ./sysutils/xfce4-netload-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-netload-plugin
 
 .if !empty(XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.3.3nb3
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.3.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
 .endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./sysutils/xfce4-quicklauncher-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.5
+++ ./sysutils/xfce4-quicklauncher-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-quicklauncher-plugin
 
 .if !empty(XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81
-BUILDLINK_RECOMMENDED.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=0.81nb3
+BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=0.81
+BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=0.81nb3
 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?=	../../sysutils/xfce4-quicklauncher-plugin
 .endif	# XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-showdesktop-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-showdesktop-plugin/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./sysutils/xfce4-showdesktop-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.8
+++ ./sysutils/xfce4-showdesktop-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-showdesktop-plugin
 
 .if !empty(XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0
-BUILDLINK_RECOMMENDED.xfce4-showdesktop-plugin?=	xfce4-showdesktop-plugin>=0.4.0nb2
+BUILDLINK_API_DEPENDS.xfce4-showdesktop-plugin+=	xfce4-showdesktop-plugin>=0.4.0
+BUILDLINK_ABI_DEPENDS.xfce4-showdesktop-plugin?=	xfce4-showdesktop-plugin>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=	../../sysutils/xfce4-showdesktop-plugin
 .endif	# XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-systemload-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-systemload-plugin/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./sysutils/xfce4-systemload-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.8
+++ ./sysutils/xfce4-systemload-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-systemload-plugin
 
 .if !empty(XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6
-BUILDLINK_RECOMMENDED.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.3.6nb3
+BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.3.6
+BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.3.6nb3
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
 .endif	# XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-systray/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-systray/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./sysutils/xfce4-systray/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.11
+++ ./sysutils/xfce4-systray/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-systray
 
 .if !empty(XFCE4_SYSTRAY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-systray?=	xfce4-systray>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-systray+=	xfce4-systray>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-systray?=	xfce4-systray>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-systray?=	../../sysutils/xfce4-systray
 .endif	# XFCE4_SYSTRAY_BUILDLINK3_MK
 
Index: ./sysutils/xfce4-xkb-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-xkb-plugin/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./sysutils/xfce4-xkb-plugin/buildlink3.mk	10 Mar 2006 08:25:05 -0000	1.7
+++ ./sysutils/xfce4-xkb-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-xkb-plugin
 
 .if !empty(XFCE4_XKB_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3
-BUILDLINK_RECOMMENDED.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.3.3
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3
+BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.3.3
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
 .endif	# XFCE4_XKB_PLUGIN_BUILDLINK3_MK
 
Index: ./textproc/aiksaurus/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/aiksaurus/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/aiksaurus/buildlink3.mk	29 Dec 2004 09:18:20 -0000	1.3
+++ ./textproc/aiksaurus/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	aiksaurus
 
 .if !empty(AIKSAURUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aiksaurus+=	aiksaurus>=1.2.1
+BUILDLINK_API_DEPENDS.aiksaurus+=	aiksaurus>=1.2.1
 BUILDLINK_PKGSRCDIR.aiksaurus?=	../../textproc/aiksaurus
 .endif	# AIKSAURUS_BUILDLINK3_MK
 
Index: ./textproc/aspell/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/aspell/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./textproc/aspell/buildlink3.mk	5 Feb 2006 23:10:59 -0000	1.9
+++ ./textproc/aspell/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	aspell
 
 .if !empty(ASPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.aspell+=	aspell>=0.50.3
-BUILDLINK_RECOMMENDED.aspell+=	aspell>=0.60.4nb1
+BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.50.3
+BUILDLINK_ABI_DEPENDS.aspell+=	aspell>=0.60.4nb1
 BUILDLINK_PKGSRCDIR.aspell?=	../../textproc/aspell
 .endif	# ASPELL_BUILDLINK3_MK
 
Index: ./textproc/aspell-czech/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/aspell-czech/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./textproc/aspell-czech/Makefile	4 Mar 2006 21:30:44 -0000	1.13
+++ ./textproc/aspell-czech/Makefile	4 Apr 2006 06:26:58 -0000
@@ -13,7 +13,7 @@
 COMMENT=	Czech language support for aspell
 
 # earlier versions core-dumped on the input
-BUILDLINK_DEPENDS.aspell+=	aspell>=0.60.2nb1
+BUILDLINK_API_DEPENDS.aspell+=	aspell>=0.60.2nb1
 
 HAS_CONFIGURE=	YES
 
Index: ./textproc/btparse/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/btparse/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./textproc/btparse/buildlink3.mk	27 Sep 2005 12:24:06 -0000	1.2
+++ ./textproc/btparse/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	btparse
 
 .if !empty(BTPARSE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.btparse+=	btparse>=0.34
+BUILDLINK_API_DEPENDS.btparse+=	btparse>=0.34
 BUILDLINK_PKGSRCDIR.btparse?=	../../textproc/btparse
 .endif	# BTPARSE_BUILDLINK3_MK
 
Index: ./textproc/chasen/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/chasen/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./textproc/chasen/buildlink3.mk	5 May 2004 00:28:50 -0000	1.1
+++ ./textproc/chasen/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	chasen
 
 .if !empty(CHASEN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen+=	chasen>=2.0
+BUILDLINK_API_DEPENDS.chasen+=	chasen>=2.0
 BUILDLINK_PKGSRCDIR.chasen?=	../../textproc/chasen
 BUILDLINK_FILES.chasen=		include/chasen.h
 BUILDLINK_FILES.chasen+=	lib/libchasen.*
Index: ./textproc/chasen-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/chasen-base/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/chasen-base/buildlink3.mk	3 Oct 2004 00:18:19 -0000	1.3
+++ ./textproc/chasen-base/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	chasen-base
 
 .if !empty(CHASEN_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.chasen-base+=	chasen-base>=2.3.3
-BUILDLINK_RECOMMENDED.chasen-base+=	chasen-base>=2.3.3nb1
+BUILDLINK_API_DEPENDS.chasen-base+=	chasen-base>=2.3.3
+BUILDLINK_ABI_DEPENDS.chasen-base+=	chasen-base>=2.3.3nb1
 BUILDLINK_PKGSRCDIR.chasen-base?=	../../textproc/chasen-base
 .endif	# CHASEN_BASE_BUILDLINK3_MK
 
Index: ./textproc/eb/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/eb/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/eb/buildlink3.mk	5 Feb 2006 23:11:01 -0000	1.7
+++ ./textproc/eb/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -26,8 +26,8 @@
 	else ${ECHO}; fi )
 
 .if !empty(EB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eb+=		eb>=${_EB_REQD}
-BUILDLINK_RECOMMENDED.eb+=	eb>=4.1.3nb1
+BUILDLINK_API_DEPENDS.eb+=		eb>=${_EB_REQD}
+BUILDLINK_ABI_DEPENDS.eb+=	eb>=4.1.3nb1
 BUILDLINK_PKGSRCDIR.eb?=	../../textproc/eb
 .endif	# EB_BUILDLINK3_MK
 
Index: ./textproc/enchant/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/enchant/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./textproc/enchant/buildlink3.mk	5 Feb 2006 23:11:01 -0000	1.6
+++ ./textproc/enchant/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	enchant
 
 .if !empty(ENCHANT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.enchant+=	enchant>=1.1.3
-BUILDLINK_RECOMMENDED.enchant+=	enchant>=1.1.6nb1
+BUILDLINK_API_DEPENDS.enchant+=	enchant>=1.1.3
+BUILDLINK_ABI_DEPENDS.enchant+=	enchant>=1.1.6nb1
 BUILDLINK_PKGSRCDIR.enchant?=	../../textproc/enchant
 .endif	# ENCHANT_BUILDLINK3_MK
 
Index: ./textproc/expat/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/expat/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./textproc/expat/buildlink3.mk	5 Feb 2006 23:11:01 -0000	1.15
+++ ./textproc/expat/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	expat
 
 .if !empty(EXPAT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.7
-BUILDLINK_RECOMMENDED.expat+=	expat>=2.0.0nb1
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.7
+BUILDLINK_ABI_DEPENDS.expat+=	expat>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif	# EXPAT_BUILDLINK3_MK
 
Index: ./textproc/expat/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/expat/builtin.mk,v
retrieving revision 1.9
diff -u -r1.9 builtin.mk
--- ./textproc/expat/builtin.mk	6 Mar 2006 19:21:34 -0000	1.9
+++ ./textproc/expat/builtin.mk	4 Apr 2006 06:26:58 -0000
@@ -54,7 +54,7 @@
 .    if defined(BUILTIN_PKG.expat) && \
         !empty(IS_BUILTIN.expat:M[yY][eE][sS])
 USE_BUILTIN.expat=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.expat}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
 .        if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
 USE_BUILTIN.expat!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then	\
@@ -77,7 +77,7 @@
 .if !empty(CHECK_BUILTIN.expat:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.expat:M[nN][oO])
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.4
 .  endif
 
 .  if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
Index: ./textproc/gdome2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gdome2/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./textproc/gdome2/buildlink3.mk	10 Feb 2006 12:09:24 -0000	1.4
+++ ./textproc/gdome2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gdome2
 
 .if !empty(GDOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gdome2+=	gdome2>=0.8.1nb1
-BUILDLINK_RECOMMENDED.gdome2?=	gdome2>=0.8.1nb2
+BUILDLINK_API_DEPENDS.gdome2+=	gdome2>=0.8.1nb1
+BUILDLINK_ABI_DEPENDS.gdome2?=	gdome2>=0.8.1nb2
 BUILDLINK_PKGSRCDIR.gdome2?=	../../textproc/gdome2
 .endif	# GDOME2_BUILDLINK3_MK
 
Index: ./textproc/gnome-doc-utils/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gnome-doc-utils/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./textproc/gnome-doc-utils/Makefile	21 Mar 2006 06:00:50 -0000	1.16
+++ ./textproc/gnome-doc-utils/Makefile	4 Apr 2006 06:26:58 -0000
@@ -30,7 +30,7 @@
 PYTHON_PATCH_SCRIPTS+=	xml2po/modes/gs.py
 PYTHON_PATCH_SCRIPTS+=	xml2po/xml2po.py
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.12
 BUILDLINK_DEPMETHOD.libxslt?=	build
 BUILDLINK_DEPMETHOD.libxml2?=	build
 
Index: ./textproc/gnome-doc-utils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gnome-doc-utils/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/gnome-doc-utils/buildlink3.mk	12 Mar 2006 22:14:09 -0000	1.7
+++ ./textproc/gnome-doc-utils/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -12,7 +12,7 @@
 
 .if !empty(GNOME_DOC_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPMETHOD.gnome-doc-utils+=	build
-BUILDLINK_DEPENDS.gnome-doc-utils+=	gnome-doc-utils>=0.6.0
+BUILDLINK_API_DEPENDS.gnome-doc-utils+=	gnome-doc-utils>=0.6.0
 BUILDLINK_PKGSRCDIR.gnome-doc-utils?=	../../textproc/gnome-doc-utils
 .endif	# GNOME_DOC_UTILS_BUILDLINK3_MK
 
Index: ./textproc/gnome-spell/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gnome-spell/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./textproc/gnome-spell/Makefile	6 Mar 2006 00:18:12 -0000	1.18
+++ ./textproc/gnome-spell/Makefile	4 Apr 2006 06:26:58 -0000
@@ -16,7 +16,7 @@
 USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		YES
 
-BUILDLINK_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.8.0nb3
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
Index: ./textproc/gnome-spell/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gnome-spell/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./textproc/gnome-spell/buildlink3.mk	5 Feb 2006 23:11:02 -0000	1.9
+++ ./textproc/gnome-spell/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-spell
 
 .if !empty(GNOME_SPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
-BUILDLINK_RECOMMENDED.gnome-spell+=	gnome-spell>=1.0.6nb3
+BUILDLINK_API_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
+BUILDLINK_ABI_DEPENDS.gnome-spell+=	gnome-spell>=1.0.6nb3
 BUILDLINK_PKGSRCDIR.gnome-spell?=	../../textproc/gnome-spell
 .endif	# GNOME_SPELL_BUILDLINK3_MK
 
Index: ./textproc/gtk-doc/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gtk-doc/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./textproc/gtk-doc/buildlink3.mk	26 Feb 2006 10:24:35 -0000	1.1
+++ ./textproc/gtk-doc/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	gtk-doc
 
 .if !empty(GTK_DOC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk-doc+=	gtk-doc>=1.4nb1
+BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.4nb1
 BUILDLINK_PKGSRCDIR.gtk-doc?=	../../textproc/gtk-doc
 .endif	# GTK_DOC_BUILDLINK3_MK
 
Index: ./textproc/gtkspell/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/gtkspell/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./textproc/gtkspell/buildlink3.mk	5 Feb 2006 23:11:02 -0000	1.6
+++ ./textproc/gtkspell/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkspell
 
 .if !empty(GTKSPELL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
-BUILDLINK_RECOMMENDED.gtkspell+=	gtkspell>=2.0.11nb2
+BUILDLINK_API_DEPENDS.gtkspell+=	gtkspell>=2.0.2nb6
+BUILDLINK_ABI_DEPENDS.gtkspell+=	gtkspell>=2.0.11nb2
 BUILDLINK_PKGSRCDIR.gtkspell?=	../../textproc/gtkspell
 .endif	# GTKSPELL_BUILDLINK3_MK
 
Index: ./textproc/hre/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/hre/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./textproc/hre/buildlink3.mk	3 Oct 2004 00:18:19 -0000	1.2
+++ ./textproc/hre/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	hre
 
 .if !empty(HRE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.hre+=		hre>=0.9.7
-BUILDLINK_RECOMMENDED.hre+=	hre>=0.9.8anb1
+BUILDLINK_API_DEPENDS.hre+=		hre>=0.9.7
+BUILDLINK_ABI_DEPENDS.hre+=	hre>=0.9.8anb1
 BUILDLINK_PKGSRCDIR.hre?=	../../textproc/hre
 .endif	# HRE_BUILDLINK3_MK
 
Index: ./textproc/icu/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/icu/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./textproc/icu/buildlink3.mk	5 Feb 2006 23:11:02 -0000	1.9
+++ ./textproc/icu/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	icu
 
 .if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.icu+=	icu>=3.4
-BUILDLINK_RECOMMENDED.icu?=	icu>=3.4nb1
+BUILDLINK_API_DEPENDS.icu+=	icu>=3.4
+BUILDLINK_ABI_DEPENDS.icu?=	icu>=3.4nb1
 BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 .endif	# ICU_BUILDLINK3_MK
 
Index: ./textproc/intltool/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/intltool/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./textproc/intltool/buildlink3.mk	5 Feb 2006 23:11:02 -0000	1.12
+++ ./textproc/intltool/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	intltool
 
 .if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.intltool+=	intltool>=0.34.1
-BUILDLINK_RECOMMENDED.intltool?=	intltool>=0.34.1nb2
+BUILDLINK_API_DEPENDS.intltool+=	intltool>=0.34.1
+BUILDLINK_ABI_DEPENDS.intltool?=	intltool>=0.34.1nb2
 BUILDLINK_PKGSRCDIR.intltool?=	../../textproc/intltool
 BUILDLINK_DEPMETHOD.intltool?=	build
 .endif	# INTLTOOL_BUILDLINK3_MK
Index: ./textproc/iso-codes/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/iso-codes/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/iso-codes/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.3
+++ ./textproc/iso-codes/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	iso-codes
 
 .if !empty(ISO_CODES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.iso-codes+=	iso-codes>=0.48
-BUILDLINK_RECOMMENDED.iso-codes?=	iso-codes>=0.48nb2
+BUILDLINK_API_DEPENDS.iso-codes+=	iso-codes>=0.48
+BUILDLINK_ABI_DEPENDS.iso-codes?=	iso-codes>=0.48nb2
 BUILDLINK_PKGSRCDIR.iso-codes?=	../../textproc/iso-codes
 .endif	# ISO_CODES_BUILDLINK3_MK
 
Index: ./textproc/jade/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/jade/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/jade/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.3
+++ ./textproc/jade/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	jade
 
 .if !empty(JADE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.jade+=	jade>=1.2.1nb7
-BUILDLINK_RECOMMENDED.jade+=	jade>=1.2.1nb10
+BUILDLINK_API_DEPENDS.jade+=	jade>=1.2.1nb7
+BUILDLINK_ABI_DEPENDS.jade+=	jade>=1.2.1nb10
 BUILDLINK_PKGSRCDIR.jade?=	../../textproc/jade
 .endif	# JADE_BUILDLINK3_MK
 
Index: ./textproc/kakasi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/kakasi/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./textproc/kakasi/buildlink3.mk	13 Mar 2006 09:17:51 -0000	1.4
+++ ./textproc/kakasi/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kakasi
 
 .if !empty(KAKASI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kakasi+=	kakasi>=2.3.0
-BUILDLINK_RECOMMENDED.kakasi+=	kakasi>=2.3.4nb4
+BUILDLINK_API_DEPENDS.kakasi+=	kakasi>=2.3.0
+BUILDLINK_ABI_DEPENDS.kakasi+=	kakasi>=2.3.4nb4
 BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
 .endif	# KAKASI_BUILDLINK3_MK
 
Index: ./textproc/libcroco/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libcroco/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./textproc/libcroco/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.11
+++ ./textproc/libcroco/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libcroco
 
 .if !empty(LIBCROCO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libcroco+=	libcroco>=0.6.0
-BUILDLINK_RECOMMENDED.libcroco+=	libcroco>=0.6.0nb4
+BUILDLINK_API_DEPENDS.libcroco+=	libcroco>=0.6.0
+BUILDLINK_ABI_DEPENDS.libcroco+=	libcroco>=0.6.0nb4
 BUILDLINK_PKGSRCDIR.libcroco?=	../../textproc/libcroco
 .endif	# LIBCROCO_BUILDLINK3_MK
 
Index: ./textproc/libpathan/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libpathan/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./textproc/libpathan/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.6
+++ ./textproc/libpathan/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libpathan
 
 .if !empty(LIBPATHAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libpathan+=	libpathan>=1.2.2
-BUILDLINK_RECOMMENDED.libpathan+=	libpathan>=1.2.2nb2
+BUILDLINK_API_DEPENDS.libpathan+=	libpathan>=1.2.2
+BUILDLINK_ABI_DEPENDS.libpathan+=	libpathan>=1.2.2nb2
 BUILDLINK_PKGSRCDIR.libpathan?=	../../textproc/libpathan
 .endif	# LIBPATHAN_BUILDLINK3_MK
 
Index: ./textproc/libunicode/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libunicode/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/libunicode/buildlink3.mk	3 Oct 2004 00:18:20 -0000	1.3
+++ ./textproc/libunicode/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libunicode
 
 .if !empty(LIBUNICODE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libunicode+=		libunicode>=0.4
-BUILDLINK_RECOMMENDED.libunicode+=	libunicode>=0.4nb1
+BUILDLINK_API_DEPENDS.libunicode+=		libunicode>=0.4
+BUILDLINK_ABI_DEPENDS.libunicode+=	libunicode>=0.4nb1
 BUILDLINK_PKGSRCDIR.libunicode?=	../../textproc/libunicode
 .endif	# LIBUNICODE_BUILDLINK3_MK
 
Index: ./textproc/libxml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./textproc/libxml/buildlink3.mk	20 Nov 2004 22:07:49 -0000	1.6
+++ ./textproc/libxml/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxml
 
 .if !empty(LIBXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml+=	libxml>=1.8.11
-BUILDLINK_RECOMMENDED.libxml+=	libxml>=1.8.17nb3
+BUILDLINK_API_DEPENDS.libxml+=	libxml>=1.8.11
+BUILDLINK_ABI_DEPENDS.libxml+=	libxml>=1.8.17nb3
 BUILDLINK_FILES.libxml+=	include/gnome-xml/libxml/*.h
 BUILDLINK_PKGSRCDIR.libxml?=	../../textproc/libxml
 .endif	# LIBXML_BUILDLINK3_MK
Index: ./textproc/libxml++2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml++2/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/libxml++2/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.3
+++ ./textproc/libxml++2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxml++2
 
 .if !empty(LIBXML++2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml++2+=	libxml++2>=2.10.0
-BUILDLINK_RECOMMENDED.libxml++2?=	libxml++2>=2.10.0nb1
+BUILDLINK_API_DEPENDS.libxml++2+=	libxml++2>=2.10.0
+BUILDLINK_ABI_DEPENDS.libxml++2?=	libxml++2>=2.10.0nb1
 BUILDLINK_PKGSRCDIR.libxml++2?=	../../textproc/libxml++2
 .endif	# LIBXML++2_BUILDLINK3_MK
 
Index: ./textproc/libxml2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxml2/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/libxml2/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.7
+++ ./textproc/libxml2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxml2
 
 .if !empty(LIBXML2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.2
-BUILDLINK_RECOMMENDED.libxml2+=	libxml2>=2.6.23nb1
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.2
+BUILDLINK_ABI_DEPENDS.libxml2+=	libxml2>=2.6.23nb1
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 BUILDLINK_FILES.libxml2+=	bin/xml2-config
Index: ./textproc/libxslt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxslt/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- ./textproc/libxslt/Makefile	5 Feb 2006 23:11:03 -0000	1.62
+++ ./textproc/libxslt/Makefile	4 Apr 2006 06:26:58 -0000
@@ -24,7 +24,7 @@
 
 TEST_TARGET=		check
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.17
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.17
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
Index: ./textproc/libxslt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/libxslt/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./textproc/libxslt/buildlink3.mk	5 Feb 2006 23:11:03 -0000	1.11
+++ ./textproc/libxslt/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxslt
 
 .if !empty(LIBXSLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.8
-BUILDLINK_RECOMMENDED.libxslt+=	libxslt>=1.1.15nb1
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.8
+BUILDLINK_ABI_DEPENDS.libxslt+=	libxslt>=1.1.15nb1
 BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
 .endif	# LIBXSLT_BUILDLINK3_MK
 
Index: ./textproc/opensp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/opensp/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/opensp/buildlink3.mk	5 Feb 2006 23:11:04 -0000	1.7
+++ ./textproc/opensp/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	opensp
 
 .if !empty(OPENSP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.opensp+=	opensp>=1.5.1
-BUILDLINK_RECOMMENDED.opensp+=	opensp>=1.5.1nb3
+BUILDLINK_API_DEPENDS.opensp+=	opensp>=1.5.1
+BUILDLINK_ABI_DEPENDS.opensp+=	opensp>=1.5.1nb3
 BUILDLINK_PKGSRCDIR.opensp?=	../../textproc/opensp
 .endif	# OPENSP_BUILDLINK3_MK
 
Index: ./textproc/p5-XML-Xerces/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/p5-XML-Xerces/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./textproc/p5-XML-Xerces/Makefile	5 Feb 2006 23:11:05 -0000	1.16
+++ ./textproc/p5-XML-Xerces/Makefile	4 Apr 2006 06:26:58 -0000
@@ -23,7 +23,7 @@
 # Xerces-C is built unthreaded in pkgsrc (for now).
 BUILDLINK_TRANSFORM+=	rm:-lpthread
 
-BUILDLINK_DEPENDS.xerces-c+=	xerces-c>=2.3.0
+BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.3.0
 .include "../../textproc/xerces-c/buildlink3.mk"
 
 .include "../../lang/perl5/module.mk"
Index: ./textproc/py-libxml2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-libxml2/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./textproc/py-libxml2/Makefile	7 Feb 2006 20:58:07 -0000	1.19
+++ ./textproc/py-libxml2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -22,7 +22,7 @@
 SUBST_SED.setup=	-e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g" \
 			-e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g"
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=${PKGVERSION}
 .include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../lang/python/extension.mk"
Index: ./textproc/py-libxslt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-libxslt/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./textproc/py-libxslt/Makefile	5 Feb 2006 23:11:07 -0000	1.16
+++ ./textproc/py-libxslt/Makefile	4 Apr 2006 06:26:58 -0000
@@ -28,7 +28,7 @@
 			-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \
 			-e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
 
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=${PKGVERSION}
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=${PKGVERSION}
 .include "../../textproc/libxslt/buildlink3.mk"
 
 .include "../../lang/python/extension.mk"
Index: ./textproc/py-xml/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-xml/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./textproc/py-xml/Makefile	5 Feb 2006 23:11:07 -0000	1.12
+++ ./textproc/py-xml/Makefile	4 Apr 2006 06:26:58 -0000
@@ -15,7 +15,7 @@
 
 PYDISTUTILSPKG=	yes
 PYBINMODULE=	yes
-BUILDLINK_DEPENDS.expat+=	expat>=1.95.6
+BUILDLINK_API_DEPENDS.expat+=	expat>=1.95.6
 PYSETUPBUILDARGS+=	--with-libexpat=${BUILDLINK_DIR}
 PYSETUPBUILDARGS+=	--ldflags="${EXPAT_LDFLAGS}"
 EXPAT_LDFLAGS=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib
Index: ./textproc/py-xml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-xml/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/py-xml/buildlink3.mk	5 Feb 2006 23:11:07 -0000	1.7
+++ ./textproc/py-xml/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyxml
 
 .if !empty(PYXML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
-BUILDLINK_RECOMMENDED.pyxml?=	${PYPKGPREFIX}-xml>=0.8.4nb2
+BUILDLINK_API_DEPENDS.pyxml+=	${PYPKGPREFIX}-xml>=0.8.3nb1
+BUILDLINK_ABI_DEPENDS.pyxml?=	${PYPKGPREFIX}-xml>=0.8.4nb2
 BUILDLINK_PKGSRCDIR.pyxml?=	../../textproc/py-xml
 .endif	# PYXML_BUILDLINK3_MK
 
Index: ./textproc/raptor/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/raptor/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./textproc/raptor/buildlink3.mk	5 Feb 2006 23:11:07 -0000	1.3
+++ ./textproc/raptor/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	raptor
 
 .if !empty(RAPTOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.raptor?=		raptor>=1.0.0
-BUILDLINK_RECOMMENDED.raptor+=		raptor>=1.0.0nb6
+BUILDLINK_API_DEPENDS.raptor?=		raptor>=1.0.0
+BUILDLINK_ABI_DEPENDS.raptor+=		raptor>=1.0.0nb6
 .endif	# RAPTOR_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
Index: ./textproc/ruby-eruby/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/ruby-eruby/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./textproc/ruby-eruby/buildlink3.mk	11 Dec 2005 13:33:26 -0000	1.4
+++ ./textproc/ruby-eruby/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	${RUBY_PKGPREFIX}-eruby
 
 .if !empty(RUBY_ERUBY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ruby18-eruby+=	${RUBY_PKGPREFIX}-eruby>=0.9.7
+BUILDLINK_API_DEPENDS.ruby18-eruby+=	${RUBY_PKGPREFIX}-eruby>=0.9.7
 BUILDLINK_PKGSRCDIR.ruby18-eruby?=	../../textproc/ruby-eruby
 .endif	# RUBY_ERUBY_BUILDLINK3_MK
 
Index: ./textproc/ruby-rdtool/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/ruby-rdtool/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./textproc/ruby-rdtool/buildlink3.mk	13 Feb 2006 15:23:28 -0000	1.5
+++ ./textproc/ruby-rdtool/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -22,7 +22,7 @@
 
 BUILDLINK_FILES.ruby18-rdtool+=		bin/rd2
 BUILDLINK_DEPMETHOD.ruby18-rdtool?=	build
-BUILDLINK_DEPENDS.ruby18-rdtool+=	{${RUBY_RD_LIST}}>=0.6.14
+BUILDLINK_API_DEPENDS.ruby18-rdtool+=	{${RUBY_RD_LIST}}>=0.6.14
 BUILDLINK_PKGSRCDIR.ruby18-rdtool?=	../../textproc/ruby-rdtool
 .endif
 
Index: ./textproc/sablotron/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/sablotron/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./textproc/sablotron/buildlink3.mk	5 Feb 2006 23:11:07 -0000	1.4
+++ ./textproc/sablotron/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sablotron
 
 .if !empty(SABLOTRON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sablotron+=	sablotron>=1.0
-BUILDLINK_RECOMMENDED.sablotron+=	sablotron>=1.0.2nb2
+BUILDLINK_API_DEPENDS.sablotron+=	sablotron>=1.0
+BUILDLINK_ABI_DEPENDS.sablotron+=	sablotron>=1.0.2nb2
 BUILDLINK_PKGSRCDIR.sablotron?=	../../textproc/sablotron
 .endif	# SABLOTRON_BUILDLINK3_MK
 
Index: ./textproc/scrollkeeper/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/scrollkeeper/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./textproc/scrollkeeper/buildlink3.mk	5 Feb 2006 23:11:07 -0000	1.7
+++ ./textproc/scrollkeeper/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	scrollkeeper
 
 .if !empty(SCROLLKEEPER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
-BUILDLINK_RECOMMENDED.scrollkeeper+=	scrollkeeper>=0.3.14nb8
+BUILDLINK_API_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.12nb2
+BUILDLINK_ABI_DEPENDS.scrollkeeper+=	scrollkeeper>=0.3.14nb8
 BUILDLINK_PKGSRCDIR.scrollkeeper?=	../../textproc/scrollkeeper
 .endif	# SCROLLKEEPER_BUILDLINK3_MK
 
Index: ./textproc/xalan-c/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/xalan-c/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./textproc/xalan-c/buildlink3.mk	5 Feb 2006 23:11:08 -0000	1.5
+++ ./textproc/xalan-c/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xalan-c
 
 .if !empty(XALAN_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xalan-c+=	xalan-c>=1.6nb3
-BUILDLINK_RECOMMENDED.xalan-c?=	xalan-c>=1.6nb4
+BUILDLINK_API_DEPENDS.xalan-c+=	xalan-c>=1.6nb3
+BUILDLINK_ABI_DEPENDS.xalan-c?=	xalan-c>=1.6nb4
 BUILDLINK_PKGSRCDIR.xalan-c?=	../../textproc/xalan-c
 .endif	# XALAN_C_BUILDLINK3_MK
 
Index: ./textproc/xerces-c/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/xerces-c/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./textproc/xerces-c/buildlink3.mk	5 Feb 2006 23:11:08 -0000	1.4
+++ ./textproc/xerces-c/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xerces-c
 
 .if !empty(XERCES_C_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xerces-c+=	xerces-c>=2.3.0
-BUILDLINK_RECOMMENDED.xerces-c?=	xerces-c>=2.3.0nb3
+BUILDLINK_API_DEPENDS.xerces-c+=	xerces-c>=2.3.0
+BUILDLINK_ABI_DEPENDS.xerces-c?=	xerces-c>=2.3.0nb3
 BUILDLINK_PKGSRCDIR.xerces-c?=	../../textproc/xerces-c
 .endif	# XERCES_C_BUILDLINK3_MK
 
Index: ./textproc/xmlcatmgr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/xmlcatmgr/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./textproc/xmlcatmgr/buildlink3.mk	26 Mar 2005 16:54:51 -0000	1.5
+++ ./textproc/xmlcatmgr/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -23,7 +23,7 @@
 BUILDLINK_PACKAGES+=	xmlcatmgr
 
 .if !empty(XMLCATMGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1
+BUILDLINK_API_DEPENDS.xmlcatmgr+=		xmlcatmgr>=2.0beta1
 BUILDLINK_PKGSRCDIR.xmlcatmgr?=		../../textproc/xmlcatmgr
 
 # Location of the xmlcatmgr binary program.
Index: ./textproc/xmlstarlet/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/xmlstarlet/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./textproc/xmlstarlet/Makefile	4 Mar 2006 21:30:52 -0000	1.7
+++ ./textproc/xmlstarlet/Makefile	4 Apr 2006 06:26:58 -0000
@@ -16,8 +16,8 @@
 CONFIGURE_ARGS+=	--with-libxslt-prefix=${BUILDLINK_PREFIX.libxslt}
 PTHREAD_OPTS+=		require
 
-BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.12
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.9
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.12
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.9
 
 TEST_TARGET=	check
 
Index: ./time/py-mxDateTime/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/time/py-mxDateTime/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./time/py-mxDateTime/buildlink3.mk	5 Feb 2006 23:11:10 -0000	1.8
+++ ./time/py-mxDateTime/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	py-mxDateTime
 
 .if !empty(PY_MXDATETIME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
-BUILDLINK_RECOMMENDED.py-mxDateTime?=	${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
+BUILDLINK_API_DEPENDS.py-mxDateTime+=	${PYPKGPREFIX}-mxDateTime>=2.0.5
+BUILDLINK_ABI_DEPENDS.py-mxDateTime?=	${PYPKGPREFIX}-mxDateTime>=2.0.6nb1
 BUILDLINK_PKGSRCDIR.py-mxDateTime?=	../../time/py-mxDateTime
 BUILDLINK_INCDIRS.py-mxDateTime+=	${PYSITELIB}/mx/DateTime/mxDateTime
 .endif	# PY_MXDATETIME_BUILDLINK3_MK
Index: ./time/xfce4-calendar/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/time/xfce4-calendar/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./time/xfce4-calendar/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.7
+++ ./time/xfce4-calendar/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-calendar
 
 .if !empty(XFCE4_CALENDAR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-calendar+=	xfce4-calendar>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-calendar?=	xfce4-calendar>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-calendar+=	xfce4-calendar>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-calendar?=	xfce4-calendar>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-calendar?=	../../time/xfce4-calendar
 .endif	# XFCE4_CALENDAR_BUILDLINK3_MK
 
Index: ./time/xfce4-datetime-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/time/xfce4-datetime-plugin/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./time/xfce4-datetime-plugin/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.6
+++ ./time/xfce4-datetime-plugin/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-datetime-plugin
 
 .if !empty(XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-datetime-plugin?=	xfce4-datetime-plugin>=0.3.1nb2
+BUILDLINK_API_DEPENDS.xfce4-datetime-plugin+=	xfce4-datetime-plugin>=0.3.1
+BUILDLINK_ABI_DEPENDS.xfce4-datetime-plugin?=	xfce4-datetime-plugin>=0.3.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=	../../time/xfce4-datetime-plugin
 .endif	# XFCE4_DATETIME_PLUGIN_BUILDLINK3_MK
 
Index: ./wm/metacity/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/metacity/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./wm/metacity/buildlink3.mk	5 Feb 2006 23:11:14 -0000	1.11
+++ ./wm/metacity/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	metacity
 
 .if !empty(METACITY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.metacity+=	metacity>=2.8.5
-BUILDLINK_RECOMMENDED.metacity+=	metacity>=2.12.2nb2
+BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
+BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.12.2nb2
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 .endif	# METACITY_BUILDLINK3_MK
 
Index: ./wm/openbox/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/openbox/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./wm/openbox/buildlink3.mk	5 Feb 2006 23:11:14 -0000	1.6
+++ ./wm/openbox/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openbox
 
 .if !empty(OPENBOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openbox+=	openbox>=3.1
-BUILDLINK_RECOMMENDED.openbox+=	openbox>=3.2nb3
+BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.1
+BUILDLINK_ABI_DEPENDS.openbox+=	openbox>=3.2nb3
 BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
 .endif	# OPENBOX_BUILDLINK3_MK
 
Index: ./wm/windowmaker/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./wm/windowmaker/buildlink3.mk	10 Mar 2006 23:04:46 -0000	1.10
+++ ./wm/windowmaker/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	windowmaker
 
 .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
-BUILDLINK_RECOMMENDED.windowmaker+=	windowmaker>=0.92.0nb5
+BUILDLINK_API_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
+BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.92.0nb5
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 .endif	# WINDOWMAKER_BUILDLINK3_MK
 
Index: ./wm/xfce4-wm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/xfce4-wm/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./wm/xfce4-wm/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.12
+++ ./wm/xfce4-wm/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-wm
 
 .if !empty(XFCE4_WM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wm+=	xfce4-wm>=4.2.3.2
-BUILDLINK_RECOMMENDED.xfce4-wm?=	xfce4-wm>=4.2.3.2nb2
+BUILDLINK_API_DEPENDS.xfce4-wm+=	xfce4-wm>=4.2.3.2
+BUILDLINK_ABI_DEPENDS.xfce4-wm?=	xfce4-wm>=4.2.3.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
 .endif	# XFCE4_WM_BUILDLINK3_MK
 
Index: ./wm/xfce4-wm-themes/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/wm/xfce4-wm-themes/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./wm/xfce4-wm-themes/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.11
+++ ./wm/xfce4-wm-themes/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-wm-themes
 
 .if !empty(XFCE4_WM_THEMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-wm-themes?=	xfce4-wm-themes>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-wm-themes+=	xfce4-wm-themes>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-wm-themes?=	xfce4-wm-themes>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=	../../wm/xfce4-wm-themes
 .endif	# XFCE4_WM_THEMES_BUILDLINK3_MK
 
Index: ./www/ap-dav/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap-dav/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./www/ap-dav/Makefile	4 Mar 2006 21:30:56 -0000	1.18
+++ ./www/ap-dav/Makefile	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 COMMENT=		Apache WebDAV module
 
 # Ugly mess that says apache>=1.3.9 and apache<2.0.
-BUILDLINK_DEPENDS.apache+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
+BUILDLINK_API_DEPENDS.apache+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}
 
 APACHE_MODULE=		YES
 GNU_CONFIGURE=		YES
Index: ./www/ap-perl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap-perl/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- ./www/ap-perl/Makefile	4 Mar 2006 21:30:56 -0000	1.41
+++ ./www/ap-perl/Makefile	4 Apr 2006 06:26:58 -0000
@@ -14,7 +14,7 @@
 
 CONFLICTS=		ap2-perl-[0-9]*
 
-DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
+DEPENDS+=		${BUILDLINK_API_DEPENDS.apache}:../../www/apache
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
 APACHE_MODULE=		YES
Index: ./www/ap-perl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap-perl/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./www/ap-perl/buildlink3.mk	5 Feb 2006 23:11:17 -0000	1.6
+++ ./www/ap-perl/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ap-perl
 
 .if !empty(AP_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
-BUILDLINK_RECOMMENDED.ap-perl?=	ap-perl>=1.29nb5
+BUILDLINK_API_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
+BUILDLINK_ABI_DEPENDS.ap-perl?=	ap-perl>=1.29nb5
 BUILDLINK_PKGSRCDIR.ap-perl?=	../../www/ap-perl
 
 BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
Index: ./www/ap-ssl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap-ssl/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- ./www/ap-ssl/Makefile	4 Mar 2006 21:30:56 -0000	1.99
+++ ./www/ap-ssl/Makefile	4 Apr 2006 06:26:58 -0000
@@ -14,7 +14,7 @@
 
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 
-BUILDLINK_DEPENDS.apache+=	apache>=1.3.33
+BUILDLINK_API_DEPENDS.apache+=	apache>=1.3.33
 
 APACHE_MODULE=		yes
 
Index: ./www/ap2-auth-ldap/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-auth-ldap/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./www/ap2-auth-ldap/Makefile	5 Feb 2006 23:11:18 -0000	1.10
+++ ./www/ap2-auth-ldap/Makefile	4 Apr 2006 06:26:58 -0000
@@ -16,7 +16,7 @@
 USE_LIBTOOL=		YES
 CPPFLAGS+=		-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber
 
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.47
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.47
 
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap}
Index: ./www/ap2-perl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-perl/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./www/ap2-perl/buildlink3.mk	5 Feb 2006 23:11:18 -0000	1.4
+++ ./www/ap2-perl/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ap2-perl
 
 .if !empty(AP2_PERL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
-BUILDLINK_RECOMMENDED.ap2-perl?=	ap2-perl>=2.0.1nb2
+BUILDLINK_API_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
+BUILDLINK_ABI_DEPENDS.ap2-perl?=	ap2-perl>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.ap2-perl?=	../../www/ap2-perl
 .endif	# AP2_PERL_BUILDLINK3_MK
 
Index: ./www/ap2-subversion/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/ap2-subversion/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./www/ap2-subversion/Makefile	7 Feb 2006 19:58:07 -0000	1.22
+++ ./www/ap2-subversion/Makefile	4 Apr 2006 06:26:58 -0000
@@ -14,7 +14,7 @@
 BUILD_TARGET=		apache-mod
 INSTALL_TARGET=		install-mods-shared
 
-BUILDLINK_DEPENDS.apache?=	apache>=2.0.48
+BUILDLINK_API_DEPENDS.apache?=	apache>=2.0.48
 
 post-patch:
 	${RM} ${WRKSRC}/build-outputs.mk
Index: ./www/apache/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./www/apache/buildlink3.mk	5 Feb 2006 23:11:18 -0000	1.13
+++ ./www/apache/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+=	apache{,6}-1.3.*
-BUILDLINK_RECOMMENDED.apache?=	apache>=1.3.34nb5
+BUILDLINK_API_DEPENDS.apache+=	apache{,6}-1.3.*
+BUILDLINK_ABI_DEPENDS.apache?=	apache>=1.3.34nb5
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
 
 .if defined(APACHE_MODULE)
Index: ./www/apache2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- ./www/apache2/Makefile	5 Feb 2006 23:11:18 -0000	1.95
+++ ./www/apache2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -27,7 +27,7 @@
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
 CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
 
-BUILDLINK_DEPENDS.apr+=	apr>=0.9.7.2.0.55
+BUILDLINK_API_DEPENDS.apr+=	apr>=0.9.7.2.0.55
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/apr/buildlink3.mk"
Index: ./www/apache2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/apache2/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./www/apache2/buildlink3.mk	5 Feb 2006 23:11:19 -0000	1.16
+++ ./www/apache2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.51
-BUILDLINK_RECOMMENDED.apache+=	apache>=2.0.55nb7
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51
+BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.55nb7
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
Index: ./www/cgic/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/cgic/buildlink3.mk,v
retrieving revision 1.1
diff -u -r1.1 buildlink3.mk
--- ./www/cgic/buildlink3.mk	8 Dec 2005 16:09:05 -0000	1.1
+++ ./www/cgic/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	cgic
 
 .if !empty(CGIC_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgic+=	cgic>=2.02nb1
+BUILDLINK_API_DEPENDS.cgic+=	cgic>=2.02nb1
 BUILDLINK_PKGSRCDIR.cgic?=	../../www/cgic
 .endif	# CGIC_BUILDLINK3_MK
 
Index: ./www/cgilib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/cgilib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./www/cgilib/buildlink3.mk	3 Oct 2004 00:18:25 -0000	1.4
+++ ./www/cgilib/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	cgilib
 
 .if !empty(CGILIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cgilib+=	cgilib>=0.5nb1
-BUILDLINK_RECOMMENDED.cgilib+=	cgilib>=0.5nb2
+BUILDLINK_API_DEPENDS.cgilib+=	cgilib>=0.5nb1
+BUILDLINK_ABI_DEPENDS.cgilib+=	cgilib>=0.5nb2
 BUILDLINK_PKGSRCDIR.cgilib?=	../../www/cgilib
 .endif	# CGILIB_BUILDLINK3_MK
 
Index: ./www/clearsilver/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/clearsilver/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./www/clearsilver/buildlink3.mk	5 Feb 2006 23:11:20 -0000	1.2
+++ ./www/clearsilver/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	clearsilver-base
 
 .if !empty(CLEARSILVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.clearsilver+=		clearsilver-base>=0.9.0
-BUILDLINK_RECOMMENDED.clearsilver+=	clearsilver>=0.10.1
+BUILDLINK_API_DEPENDS.clearsilver+=		clearsilver-base>=0.9.0
+BUILDLINK_ABI_DEPENDS.clearsilver+=	clearsilver>=0.10.1
 BUILDLINK_PKGSRCDIR.clearsilver?=	../../www/clearsilver-base
 .endif
 
Index: ./www/curl/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/curl/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./www/curl/buildlink3.mk	21 Mar 2006 21:49:47 -0000	1.12
+++ ./www/curl/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	curl
 
 .if !empty(CURL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_RECOMMENDED.curl+=	curl>=7.15.3
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
+BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.15.3
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 .endif	# CURL_BUILDLINK3_MK
 
Index: ./www/drivel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/drivel/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- ./www/drivel/Makefile	21 Mar 2006 06:00:51 -0000	1.28
+++ ./www/drivel/Makefile	4 Apr 2006 06:26:58 -0000
@@ -18,7 +18,7 @@
 
 GCONF2_SCHEMAS=		drivel.schemas
 
-BUILDLINK_DEPENDS.curl+=	curl>=7.14.0nb1
+BUILDLINK_API_DEPENDS.curl+=	curl>=7.14.0nb1
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
Index: ./www/epiphany/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/epiphany/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- ./www/epiphany/Makefile	21 Mar 2006 06:00:51 -0000	1.50
+++ ./www/epiphany/Makefile	4 Apr 2006 06:26:58 -0000
@@ -30,7 +30,7 @@
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 # Require a version that has the .pc files in it.
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.5nb2
+BUILDLINK_API_DEPENDS.firefox+=	firefox>=1.5nb2
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
 CFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
@@ -50,9 +50,9 @@
 GCONF2_SCHEMAS=		epiphany.schemas
 GCONF2_SCHEMAS+=	epiphany-lockdown.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.8.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.3
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./www/epiphany/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/epiphany/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./www/epiphany/buildlink3.mk	5 Feb 2006 23:11:20 -0000	1.13
+++ ./www/epiphany/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -14,8 +14,8 @@
 
 .if !empty(EPIPHANY_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			epiphany
-BUILDLINK_DEPENDS.epiphany+=		epiphany>=1.8.2
-BUILDLINK_RECOMMENDED.epiphany?=		epiphany>=1.8.3nb2
+BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=1.8.2
+BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=1.8.3nb2
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.prefs.mk"
Index: ./www/epiphany-extensions/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/epiphany-extensions/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./www/epiphany-extensions/Makefile	6 Mar 2006 00:18:26 -0000	1.24
+++ ./www/epiphany-extensions/Makefile	4 Apr 2006 06:26:58 -0000
@@ -36,7 +36,7 @@
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr
 .endif
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./www/fcgi/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/fcgi/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./www/fcgi/buildlink3.mk	3 Oct 2004 00:18:25 -0000	1.2
+++ ./www/fcgi/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fcgi
 
 .if !empty(FCGI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fcgi+=	fcgi>=2.2.2nb1
-BUILDLINK_RECOMMENDED.fcgi+=	fcgi>=2.4.0nb1
+BUILDLINK_API_DEPENDS.fcgi+=	fcgi>=2.2.2nb1
+BUILDLINK_ABI_DEPENDS.fcgi+=	fcgi>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.fcgi?=	../../www/fcgi
 .endif	# FCGI_BUILDLINK3_MK
 
Index: ./www/firefox/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./www/firefox/buildlink3.mk	6 Feb 2006 00:37:54 -0000	1.11
+++ ./www/firefox/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=		firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.5
-BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox+=	firefox>=1.5
+BUILDLINK_ABI_DEPENDS.firefox+=	firefox>=1.5.0.1nb1
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
Index: ./www/firefox-gtk1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-gtk1/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./www/firefox-gtk1/buildlink3.mk	5 Feb 2006 23:11:21 -0000	1.9
+++ ./www/firefox-gtk1/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	firefox-gtk1
 
 .if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5
-BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.5.0.1nb1
+BUILDLINK_API_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5
+BUILDLINK_ABI_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5.0.1nb1
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
 .endif	# FIREFOX_GTK2_BUILDLINK3_MK
 
Index: ./www/glibwww/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/glibwww/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./www/glibwww/buildlink3.mk	5 Feb 2006 23:11:24 -0000	1.3
+++ ./www/glibwww/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	glibwww
 
 .if !empty(GLIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.glibwww?=	glibwww>=0.2nb5
-BUILDLINK_RECOMMENDED.glibwww+=	glibwww>=0.2nb8
+BUILDLINK_API_DEPENDS.glibwww?=	glibwww>=0.2nb5
+BUILDLINK_ABI_DEPENDS.glibwww+=	glibwww>=0.2nb8
 BUILDLINK_PKGSRCDIR.glibwww?=	../../www/glibwww
 .endif	# GLIBWWW_BUILDLINK3_MK
 
Index: ./www/gtkhtml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/gtkhtml/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./www/gtkhtml/buildlink3.mk	5 Feb 2006 23:11:24 -0000	1.6
+++ ./www/gtkhtml/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkhtml
 
 .if !empty(GTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
-BUILDLINK_RECOMMENDED.gtkhtml?=	gtkhtml>=1.1.10nb7
+BUILDLINK_API_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
+BUILDLINK_ABI_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb7
 BUILDLINK_PKGSRCDIR.gtkhtml?=	../../www/gtkhtml
 .endif	# GTKHTML_BUILDLINK3_MK
 
Index: ./www/gtkhtml30/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/gtkhtml30/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./www/gtkhtml30/buildlink3.mk	5 Feb 2006 23:11:24 -0000	1.4
+++ ./www/gtkhtml30/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkhtml30
 
 .if !empty(GTKHTML30_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml30+=	gtkhtml30>=3.0.10
-BUILDLINK_RECOMMENDED.gtkhtml30?=	gtkhtml30>=3.0.10nb6
+BUILDLINK_API_DEPENDS.gtkhtml30+=	gtkhtml30>=3.0.10
+BUILDLINK_ABI_DEPENDS.gtkhtml30?=	gtkhtml30>=3.0.10nb6
 BUILDLINK_PKGSRCDIR.gtkhtml30?=	../../www/gtkhtml30
 .endif	# GTKHTML30_BUILDLINK3_MK
 
Index: ./www/gtkhtml36/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/gtkhtml36/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./www/gtkhtml36/buildlink3.mk	5 Feb 2006 23:11:24 -0000	1.5
+++ ./www/gtkhtml36/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkhtml36
 
 .if !empty(GTKHTML36_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.0
-BUILDLINK_RECOMMENDED.gtkhtml36?=	gtkhtml36>=3.6.2nb3
+BUILDLINK_API_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.0
+BUILDLINK_ABI_DEPENDS.gtkhtml36?=	gtkhtml36>=3.6.2nb3
 BUILDLINK_PKGSRCDIR.gtkhtml36?=	../../www/gtkhtml36
 .endif	# GTKHTML36_BUILDLINK3_MK
 
Index: ./www/gtkhtml38/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/gtkhtml38/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./www/gtkhtml38/buildlink3.mk	6 Mar 2006 00:18:12 -0000	1.6
+++ ./www/gtkhtml38/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkhtml38
 
 .if !empty(GTKHTML38_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
-BUILDLINK_RECOMMENDED.gtkhtml38?=	gtkhtml38>=3.8.2
+BUILDLINK_API_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
+BUILDLINK_ABI_DEPENDS.gtkhtml38?=	gtkhtml38>=3.8.2
 BUILDLINK_PKGSRCDIR.gtkhtml38?=	../../www/gtkhtml38
 .endif	# GTKHTML38_BUILDLINK3_MK
 
Index: ./www/libghttp/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/libghttp/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./www/libghttp/buildlink3.mk	3 Oct 2004 00:18:26 -0000	1.3
+++ ./www/libghttp/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libghttp
 
 .if !empty(LIBGHTTP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libghttp+=	libghttp>=1.0.9
-BUILDLINK_RECOMMENDED.libghttp+=	libghttp>=1.0.9nb1
+BUILDLINK_API_DEPENDS.libghttp+=	libghttp>=1.0.9
+BUILDLINK_ABI_DEPENDS.libghttp+=	libghttp>=1.0.9nb1
 BUILDLINK_PKGSRCDIR.libghttp?=	../../www/libghttp
 .endif	# LIBGHTTP_BUILDLINK3_MK
 
Index: ./www/libgtkhtml/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/libgtkhtml/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./www/libgtkhtml/buildlink3.mk	5 Feb 2006 23:11:25 -0000	1.10
+++ ./www/libgtkhtml/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libgtkhtml
 
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
-BUILDLINK_RECOMMENDED.libgtkhtml+=	libgtkhtml>=2.6.3nb3
+BUILDLINK_API_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
+BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb3
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 .endif	# LIBGTKHTML_BUILDLINK3_MK
 
Index: ./www/libwww/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/libwww/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./www/libwww/buildlink3.mk	5 Feb 2006 23:11:25 -0000	1.6
+++ ./www/libwww/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libwww
 
 .if !empty(LIBWWW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libwww+=	libwww>=5.3.2nb2
-BUILDLINK_RECOMMENDED.libwww+=	libwww>=5.4.0nb5
+BUILDLINK_API_DEPENDS.libwww+=	libwww>=5.3.2nb2
+BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb5
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 .endif	# LIBWWW_BUILDLINK3_MK
 
Index: ./www/mozilla/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla/buildlink3.mk,v
retrieving revision 1.17
diff -u -r1.17 buildlink3.mk
--- ./www/mozilla/buildlink3.mk	6 Feb 2006 00:25:06 -0000	1.17
+++ ./www/mozilla/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=		mozilla
 
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla+=	mozilla>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla+=	mozilla>=1.7.12nb3
 BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 .endif	# MOZILLA_BUILDLINK3_MK
 
Index: ./www/mozilla/gecko-depends.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla/gecko-depends.mk,v
retrieving revision 1.2
diff -u -r1.2 gecko-depends.mk
--- ./www/mozilla/gecko-depends.mk	28 Sep 2005 12:04:29 -0000	1.2
+++ ./www/mozilla/gecko-depends.mk	4 Apr 2006 06:26:58 -0000
@@ -2,7 +2,7 @@
 
 .if !empty(PKG_OPTIONS:Mfirefox)
 # firefox didn't have a pkgconfig file before 1.0.4
-BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+BUILDLINK_API_DEPENDS.firefox+= firefox>=1.0.4
 .include "../../www/firefox/buildlink3.mk"
 .else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
Index: ./www/mozilla-gtk2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla-gtk2/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./www/mozilla-gtk2/buildlink3.mk	6 Feb 2006 00:25:06 -0000	1.15
+++ ./www/mozilla-gtk2/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=			mozilla-gtk2
 
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.12nb3
+BUILDLINK_API_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
+BUILDLINK_ABI_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.12nb3
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
Index: ./www/neon/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/neon/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./www/neon/buildlink3.mk	5 Feb 2006 23:11:26 -0000	1.6
+++ ./www/neon/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	neon
 
 .if !empty(NEON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neon+=	neon>=0.24.4
-BUILDLINK_RECOMMENDED.neon+=	neon>=0.25.5nb2
+BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.4
+BUILDLINK_ABI_DEPENDS.neon+=	neon>=0.25.5nb2
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
 .endif	# NEON_BUILDLINK3_MK
 
Index: ./www/p5-libapreq2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/p5-libapreq2/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- ./www/p5-libapreq2/Makefile	4 Mar 2006 21:31:03 -0000	1.17
+++ ./www/p5-libapreq2/Makefile	4 Apr 2006 06:26:58 -0000
@@ -12,8 +12,8 @@
 
 DEPENDS+=	p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
 
-BUILDLINK_DEPENDS.apache+=	apache>=2.0.48
-BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
+BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.48
+BUILDLINK_API_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
 
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
Index: ./www/php4/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/php4/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./www/php4/buildlink3.mk	5 Feb 2006 23:11:28 -0000	1.8
+++ ./www/php4/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.php+=		php-4.4.*
-BUILDLINK_RECOMMENDED.php+=	php>=4.4.1nb3
+BUILDLINK_API_DEPENDS.php+=		php-4.4.*
+BUILDLINK_ABI_DEPENDS.php+=	php>=4.4.1nb3
 BUILDLINK_PKGSRCDIR.php?=	../../www/php4
 .endif	# PHP_BUILDLINK3_MK
 
Index: ./www/py-curl/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/py-curl/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./www/py-curl/Makefile	5 Feb 2006 23:11:28 -0000	1.26
+++ ./www/py-curl/Makefile	4 Apr 2006 06:26:58 -0000
@@ -15,7 +15,7 @@
 PYTHON_VERSIONS_ACCEPTED=	23 22
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
-BUILDLINK_DEPENDS.curl+=        curl>=7.12.1
+BUILDLINK_API_DEPENDS.curl+=        curl>=7.12.1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../lang/python/extension.mk"
Index: ./www/sope/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/sope/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./www/sope/buildlink3.mk	5 Feb 2006 23:11:28 -0000	1.3
+++ ./www/sope/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	sope
 
 .if !empty(SOPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sope+=	sope>=4.5.4nb2
-BUILDLINK_RECOMMENDED.sope?=	sope>=4.5.4nb3
+BUILDLINK_API_DEPENDS.sope+=	sope>=4.5.4nb2
+BUILDLINK_ABI_DEPENDS.sope?=	sope>=4.5.4nb3
 BUILDLINK_PKGSRCDIR.sope?=	../../www/sope
 .endif	# SOPE_BUILDLINK3_MK
 
Index: ./www/tidy/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/tidy/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./www/tidy/buildlink3.mk	5 Feb 2006 23:11:29 -0000	1.3
+++ ./www/tidy/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tidy
 
 .if !empty(TIDY_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tidy+=	tidy>=20031002
-BUILDLINK_RECOMMENDED.tidy?=	tidy>=20050921nb1
+BUILDLINK_API_DEPENDS.tidy+=	tidy>=20031002
+BUILDLINK_ABI_DEPENDS.tidy?=	tidy>=20050921nb1
 BUILDLINK_PKGSRCDIR.tidy?=	../../www/tidy
 .endif	# TIDY_BUILDLINK3_MK
 
Index: ./www/zope25/product.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25/product.mk,v
retrieving revision 1.9
diff -u -r1.9 product.mk
--- ./www/zope25/product.mk	12 Mar 2006 17:35:05 -0000	1.9
+++ ./www/zope25/product.mk	4 Apr 2006 06:26:58 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: product.mk,v 1.9 2006/03/12 17:35:05 rillig Exp $
 
 DIST_SUBDIR=	zope
-BUILDLINK_DEPENDS.zope?=	zope-2.*
-DEPENDS+=	${BUILDLINK_DEPENDS.zope}:../../www/zope25
+BUILDLINK_API_DEPENDS.zope?=	zope-2.*
+DEPENDS+=	${BUILDLINK_API_DEPENDS.zope}:../../www/zope25
 EVAL_PREFIX+=	BUILDLINK_PREFIX.zope=zope25
 BUILDLINK_PREFIX.zope_DEFAULT=	${LOCALBASE}
 WRKSRC?=	${WRKDIR}
Index: ./www/zope25-CMFPlone/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25-CMFPlone/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./www/zope25-CMFPlone/Makefile	4 Mar 2006 21:31:04 -0000	1.14
+++ ./www/zope25-CMFPlone/Makefile	4 Apr 2006 06:26:58 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=	http://www.plone.org/
 COMMENT=	Content Management System
 
-BUILDLINK_DEPENDS.zope+=	zope-2.6.*
+BUILDLINK_API_DEPENDS.zope+=	zope-2.6.*
 DEPENDS+=	zope25-CMF-[0-9]*:../../www/zope25-CMF
 DEPENDS+=	zope25-Formulator-[0-9]*:../../www/zope25-Formulator
 
Index: ./www/zope25-EasyImage/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25-EasyImage/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./www/zope25-EasyImage/Makefile	4 Mar 2006 21:31:05 -0000	1.12
+++ ./www/zope25-EasyImage/Makefile	4 Apr 2006 06:26:58 -0000
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://www.zope.org/Members/regebro/easyimage/
 EXTRACT_SUFX=	.zip
 
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/regebro/easyimage
Index: ./www/zope25-JPicture/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25-JPicture/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./www/zope25-JPicture/Makefile	4 Mar 2006 21:31:05 -0000	1.12
+++ ./www/zope25-JPicture/Makefile	4 Apr 2006 06:26:58 -0000
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://www.dataflake.org/software/jpicture/
 EXTRACT_SUFX=	.tgz
 
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dataflake.org/software/jpicture/
Index: ./www/zope25-PropertyFolder/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25-PropertyFolder/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./www/zope25-PropertyFolder/Makefile	4 Mar 2006 21:31:05 -0000	1.9
+++ ./www/zope25-PropertyFolder/Makefile	4 Apr 2006 06:26:58 -0000
@@ -9,7 +9,7 @@
 HOMEPAGE=	http://www.zope.org/Members/mjablonski/PropertyFolder
 COMMENT=	The folderish friend of the PropertyObject
 
-BUILDLINK_DEPENDS.zope+=	zope>=2.6.1
+BUILDLINK_API_DEPENDS.zope+=	zope>=2.6.1
 
 .include "../../www/zope25/product.mk"
 .include "../../mk/bsd.pkg.mk"
Index: ./www/zope25-ZPhotoSlides/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/zope25-ZPhotoSlides/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./www/zope25-ZPhotoSlides/Makefile	4 Mar 2006 21:31:06 -0000	1.21
+++ ./www/zope25-ZPhotoSlides/Makefile	4 Apr 2006 06:26:58 -0000
@@ -7,7 +7,7 @@
 MASTER_SITES=	http://www.zope.org/Members/p3b/ZPhotoSlides/
 
 DEPENDS+=	zope25-LocalFS-[0-9]*:../../www/zope25-LocalFS
-BUILDLINK_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
+BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.zope.org/Members/p3b/ZPhotoSlides
Index: ./x11/XFree86-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XFree86-libs/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./x11/XFree86-libs/buildlink3.mk	23 Feb 2006 23:17:30 -0000	1.8
+++ ./x11/XFree86-libs/buildlink3.mk	4 Apr 2006 06:26:58 -0000
@@ -18,8 +18,8 @@
 
 .if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
-BUILDLINK_RECOMMENDED.XFree86-libs+=	XFree86-libs>=4.4.0nb7
+BUILDLINK_API_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
+BUILDLINK_ABI_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0nb7
 BUILDLINK_PKGSRCDIR.XFree86-libs?=	../../x11/XFree86-libs
 BUILDLINK_LIBDIRS.XFree86-libs?=	${X11ROOT_PREFIX}/lib
 BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
Index: ./x11/XFree86-libs/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XFree86-libs/builtin.mk,v
retrieving revision 1.2
diff -u -r1.2 builtin.mk
--- ./x11/XFree86-libs/builtin.mk	24 Jun 2005 05:21:31 -0000	1.2
+++ ./x11/XFree86-libs/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -43,7 +43,7 @@
 .    if defined(BUILTIN_PKG.XFree86-libs) && \
         !empty(IS_BUILTIN.XFree86-libs:M[yY][eE][sS])
 USE_BUILTIN.XFree86-libs=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.XFree86-libs}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.XFree86-libs}
 .        if !empty(USE_BUILTIN.XFree86-libs:M[yY][eE][sS])
 USE_BUILTIN.XFree86-libs!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.XFree86-libs:Q}; then \
Index: ./x11/Xaw-Xpm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xaw-Xpm/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/Xaw-Xpm/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.4
+++ ./x11/Xaw-Xpm/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xaw-Xpm
 
 .if !empty(XAW_XPM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
-BUILDLINK_RECOMMENDED.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
+BUILDLINK_API_DEPENDS.Xaw-Xpm+=	Xaw-Xpm>=1.1
+BUILDLINK_ABI_DEPENDS.Xaw-Xpm?=	Xaw-Xpm>=1.1nb2
 BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 .endif	# XAW_XPM_BUILDLINK3_MK
 
Index: ./x11/Xaw3d/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xaw3d/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/Xaw3d/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.4
+++ ./x11/Xaw3d/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xaw3d
 
 .if !empty(XAW3D_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xaw3d+=	Xaw3d>=1.5
-BUILDLINK_RECOMMENDED.Xaw3d?=	Xaw3d>=1.5Enb1
+BUILDLINK_API_DEPENDS.Xaw3d+=	Xaw3d>=1.5
+BUILDLINK_ABI_DEPENDS.Xaw3d?=	Xaw3d>=1.5Enb1
 BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
 .endif	# XAW3D_BUILDLINK3_MK
 
Index: ./x11/Xbae/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xbae/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/Xbae/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.3
+++ ./x11/Xbae/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xbae
 
 .if !empty(XBAE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xbae+=	Xbae>=4.8.4
-BUILDLINK_RECOMMENDED.Xbae+=	Xbae>=4.51.01nb2
+BUILDLINK_API_DEPENDS.Xbae+=	Xbae>=4.8.4
+BUILDLINK_ABI_DEPENDS.Xbae+=	Xbae>=4.51.01nb2
 BUILDLINK_PKGSRCDIR.Xbae?=	../../x11/Xbae
 .endif	# XBAE_BUILDLINK3_MK
 
Index: ./x11/Xcomposite/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xcomposite/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/Xcomposite/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.2
+++ ./x11/Xcomposite/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xcomposite
 
 .if !empty(XCOMPOSITE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
-BUILDLINK_RECOMMENDED.Xcomposite?=	Xcomposite>=1.0.1nb2
+BUILDLINK_API_DEPENDS.Xcomposite+=		Xcomposite>=1.0.1
+BUILDLINK_ABI_DEPENDS.Xcomposite?=	Xcomposite>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
 .endif	# XCOMPOSITE_BUILDLINK3_MK
 
Index: ./x11/Xcomposite/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xcomposite/builtin.mk,v
retrieving revision 1.9
diff -u -r1.9 builtin.mk
--- ./x11/Xcomposite/builtin.mk	3 Jun 2005 19:12:49 -0000	1.9
+++ ./x11/Xcomposite/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -34,7 +34,7 @@
 .    if defined(BUILTIN_PKG.Xcomposite) && \
         !empty(IS_BUILTIN.Xcomposite:M[yY][eE][sS])
 USE_BUILTIN.Xcomposite=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xcomposite}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xcomposite}
 .        if !empty(USE_BUILTIN.Xcomposite:M[yY][eE][sS])
 USE_BUILTIN.Xcomposite!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xcomposite:Q}; then \
Index: ./x11/Xfixes/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xfixes/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/Xfixes/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.6
+++ ./x11/Xfixes/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xfixes
 
 .if !empty(XFIXES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xfixes+=	Xfixes>=2.0.0
-BUILDLINK_RECOMMENDED.Xfixes+=	Xfixes>=2.0.1nb2
+BUILDLINK_API_DEPENDS.Xfixes+=	Xfixes>=2.0.0
+BUILDLINK_ABI_DEPENDS.Xfixes+=	Xfixes>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.Xfixes?=	../../x11/Xfixes
 .endif	# XFIXES_BUILDLINK3_MK
 
Index: ./x11/Xfixes/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xfixes/builtin.mk,v
retrieving revision 1.8
diff -u -r1.8 builtin.mk
--- ./x11/Xfixes/builtin.mk	3 Jun 2005 19:12:49 -0000	1.8
+++ ./x11/Xfixes/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -33,7 +33,7 @@
 .    if defined(BUILTIN_PKG.Xfixes) && \
         !empty(IS_BUILTIN.Xfixes:M[yY][eE][sS])
 USE_BUILTIN.Xfixes=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xfixes}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xfixes}
 .        if !empty(USE_BUILTIN.Xfixes:M[yY][eE][sS])
 USE_BUILTIN.Xfixes!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xfixes:Q}; then \
Index: ./x11/XmHTML/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/XmHTML/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/XmHTML/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.3
+++ ./x11/XmHTML/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	XmHTML
 
 .if !empty(XMHTML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
-BUILDLINK_RECOMMENDED.XmHTML+=	XmHTML>=1.1.7nb5
+BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
+BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb5
 BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
 .endif	# XMHTML_BUILDLINK3_MK
 
Index: ./x11/Xrandr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrandr/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./x11/Xrandr/Makefile	4 Mar 2006 21:31:07 -0000	1.18
+++ ./x11/Xrandr/Makefile	4 Apr 2006 06:26:59 -0000
@@ -20,8 +20,8 @@
 
 PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
 
 .include "../../x11/Xrender/buildlink3.mk"
 .include "../../x11/randrext/buildlink3.mk"
Index: ./x11/Xrandr/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrandr/buildlink3.mk,v
retrieving revision 1.20
diff -u -r1.20 buildlink3.mk
--- ./x11/Xrandr/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.20
+++ ./x11/Xrandr/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xrandr
 
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=0.99
-BUILDLINK_RECOMMENDED.Xrandr+=	Xrandr>=1.0.2nb3
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=0.99
+BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
Index: ./x11/Xrandr/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrandr/builtin.mk,v
retrieving revision 1.13
diff -u -r1.13 builtin.mk
--- ./x11/Xrandr/builtin.mk	9 Jul 2005 03:14:36 -0000	1.13
+++ ./x11/Xrandr/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -77,7 +77,7 @@
 .    if defined(BUILTIN_PKG.Xrandr) && \
         !empty(IS_BUILTIN.Xrandr:M[yY][eE][sS])
 USE_BUILTIN.Xrandr=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xrandr}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xrandr}
 .        if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
 USE_BUILTIN.Xrandr!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrandr:Q}; then	\
@@ -100,8 +100,8 @@
 .if !empty(CHECK_BUILTIN.Xrandr:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.Xrandr:M[nN][oO])
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.1
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0.1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .  endif
 
 .  if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
Index: ./x11/Xrender/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrender/buildlink3.mk,v
retrieving revision 1.36
diff -u -r1.36 buildlink3.mk
--- ./x11/Xrender/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.36
+++ ./x11/Xrender/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Xrender
 
 .if !empty(XRENDER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.2
-BUILDLINK_RECOMMENDED.Xrender+=	Xrender>=0.9.0nb1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.2
+BUILDLINK_ABI_DEPENDS.Xrender+=	Xrender>=0.9.0nb1
 BUILDLINK_PKGSRCDIR.Xrender?=	../../x11/Xrender
 .endif	# XRENDER_BUILDLINK3_MK
 
Index: ./x11/Xrender/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/Xrender/builtin.mk,v
retrieving revision 1.15
diff -u -r1.15 builtin.mk
--- ./x11/Xrender/builtin.mk	9 Oct 2005 21:30:55 -0000	1.15
+++ ./x11/Xrender/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -77,7 +77,7 @@
 .    if defined(BUILTIN_PKG.Xrender) && \
         !empty(IS_BUILTIN.Xrender:M[yY][eE][sS])
 USE_BUILTIN.Xrender=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.Xrender}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.Xrender}
 .        if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
 USE_BUILTIN.Xrender!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.Xrender:Q}; then \
@@ -100,8 +100,8 @@
 .if !empty(CHECK_BUILTIN.Xrender:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.Xrender:M[nN][oO])
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8.2
-BUILDLINK_DEPENDS.render+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8.2
+BUILDLINK_API_DEPENDS.render+=	Xrender>=0.8
 .  endif
 
 .  if !empty(USE_BUILTIN.Xrender:M[yY][eE][sS])
Index: ./x11/blt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/blt/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/blt/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.7
+++ ./x11/blt/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	blt
 
 .if !empty(BLT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.blt+=		blt>=2.4z
-BUILDLINK_RECOMMENDED.blt?=	blt>=2.4znb2
+BUILDLINK_API_DEPENDS.blt+=		blt>=2.4z
+BUILDLINK_ABI_DEPENDS.blt?=	blt>=2.4znb2
 BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
 .endif	# BLT_BUILDLINK3_MK
 
Index: ./x11/compositeext/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/compositeext/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/compositeext/buildlink3.mk	5 Feb 2006 23:11:31 -0000	1.2
+++ ./x11/compositeext/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -12,8 +12,8 @@
 
 .if !empty(COMPOSITEEXT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			compositeext
-BUILDLINK_DEPENDS.compositeext?=	compositeext>=2.0
-BUILDLINK_RECOMMENDED.compositeext?=	compositeext>=2.0nb1
+BUILDLINK_API_DEPENDS.compositeext?=	compositeext>=2.0
+BUILDLINK_ABI_DEPENDS.compositeext?=	compositeext>=2.0nb1
 BUILDLINK_PKGSRCDIR.compositeext?=	../../x11/compositeext
 
 .include "../../x11/fixesext/buildlink3.mk"
Index: ./x11/compositeext/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/compositeext/builtin.mk,v
retrieving revision 1.5
diff -u -r1.5 builtin.mk
--- ./x11/compositeext/builtin.mk	1 Jun 2005 18:03:27 -0000	1.5
+++ ./x11/compositeext/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -39,7 +39,7 @@
 .    if defined(BUILTIN_PKG.compositeext) && \
         !empty(IS_BUILTIN.compositeext:M[yY][eE][sS])
 USE_BUILTIN.compositeext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.compositeext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.compositeext}
 .        if !empty(USE_BUILTIN.compositeext:M[yY][eE][sS])
 USE_BUILTIN.compositeext!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.compositeext:Q}; then \
Index: ./x11/control-center/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/control-center/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/control-center/buildlink3.mk	5 Feb 2006 23:11:32 -0000	1.3
+++ ./x11/control-center/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	control-center
 
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
-BUILDLINK_RECOMMENDED.control-center+=	control-center>=1.4.0.5nb2
+BUILDLINK_API_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
+BUILDLINK_ABI_DEPENDS.control-center+=	control-center>=1.4.0.5nb2
 BUILDLINK_PKGSRCDIR.control-center?=	../../x11/control-center
 .endif	# CONTROL_CENTER_BUILDLINK3_MK
 
Index: ./x11/devilspie/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/devilspie/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./x11/devilspie/Makefile	12 Mar 2006 18:23:09 -0000	1.23
+++ ./x11/devilspie/Makefile	4 Apr 2006 06:26:59 -0000
@@ -19,7 +19,7 @@
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/devilspie
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/devilspie/
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.9.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
Index: ./x11/efltk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/efltk/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/efltk/buildlink3.mk	5 Feb 2006 23:11:32 -0000	1.4
+++ ./x11/efltk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	efltk
 
 .if !empty(EFLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.efltk+=	efltk>=2.0.5nb1
-BUILDLINK_RECOMMENDED.efltk?=	efltk>=2.0.5nb4
+BUILDLINK_API_DEPENDS.efltk+=	efltk>=2.0.5nb1
+BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.5nb4
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 .endif	# EFLTK_BUILDLINK3_MK
 
Index: ./x11/fltk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fltk/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/fltk/buildlink3.mk	5 Feb 2006 23:11:32 -0000	1.11
+++ ./x11/fltk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fltk
 
 .if !empty(FLTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fltk+=	fltk>=1.1.5rc1
-BUILDLINK_RECOMMENDED.fltk+=	fltk>=1.1.7nb1
+BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1
+BUILDLINK_ABI_DEPENDS.fltk+=	fltk>=1.1.7nb1
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
 BUILDLINK_FILES.fltk+=		include/Fl/*
 .endif	# FLTK_BUILDLINK3_MK
Index: ./x11/fixesext/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fixesext/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/fixesext/buildlink3.mk	5 Feb 2006 23:11:32 -0000	1.3
+++ ./x11/fixesext/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fixesext
 
 .if !empty(FIXESEXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fixesext+=	fixesext>=2.0
-BUILDLINK_RECOMMENDED.fixesext?=	fixesext>=2.0.1nb1
+BUILDLINK_API_DEPENDS.fixesext+=	fixesext>=2.0
+BUILDLINK_ABI_DEPENDS.fixesext?=	fixesext>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.fixesext?=	../../x11/fixesext
 .endif	# FIXESEXT_BUILDLINK3_MK
 
Index: ./x11/fixesext/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fixesext/builtin.mk,v
retrieving revision 1.4
diff -u -r1.4 builtin.mk
--- ./x11/fixesext/builtin.mk	1 Jun 2005 18:03:28 -0000	1.4
+++ ./x11/fixesext/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -39,7 +39,7 @@
 .    if defined(BUILTIN_PKG.fixesext) && \
         !empty(IS_BUILTIN.fixesext:M[yY][eE][sS])
 USE_BUILTIN.fixesext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.fixesext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.fixesext}
 .        if !empty(USE_BUILTIN.fixesext:M[yY][eE][sS])
 USE_BUILTIN.fixesext!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.fixesext:Q}; then \
Index: ./x11/fox/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/fox/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./x11/fox/buildlink3.mk	5 Feb 2006 23:11:32 -0000	1.9
+++ ./x11/fox/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	fox
 
 .if !empty(FOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.fox+=		fox>=1.4.16
-BUILDLINK_RECOMMENDED.fox?=	fox>=1.4.17nb1
+BUILDLINK_API_DEPENDS.fox+=		fox>=1.4.16
+BUILDLINK_ABI_DEPENDS.fox?=	fox>=1.4.17nb1
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 BUILDLINK_INCDIRS.fox?=		include/fox-1.4
 .endif	# FOX_BUILDLINK3_MK
Index: ./x11/gdm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gdm/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- ./x11/gdm/Makefile	21 Mar 2006 06:00:52 -0000	1.102
+++ ./x11/gdm/Makefile	4 Apr 2006 06:26:59 -0000
@@ -14,7 +14,7 @@
 
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.libart2+=	libart2>=2.3.11
+BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.11
 
 SITES_Daemon.README=	${MASTER_SITE_LOCAL}
 SITES_Daemon.png=	${MASTER_SITE_LOCAL}
Index: ./x11/gnome-desktop/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-desktop/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- ./x11/gnome-desktop/Makefile	21 Mar 2006 06:00:52 -0000	1.50
+++ ./x11/gnome-desktop/Makefile	4 Apr 2006 06:26:59 -0000
@@ -19,7 +19,7 @@
 USE_TOOLS+=		gmake perl:run pkg-config
 USE_LIBTOOL=		yes
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
Index: ./x11/gnome-desktop/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-desktop/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./x11/gnome-desktop/buildlink3.mk	6 Mar 2006 00:18:11 -0000	1.15
+++ ./x11/gnome-desktop/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.12.1
-BUILDLINK_RECOMMENDED.gnome-desktop?=	gnome-desktop>=2.12.3
+BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.12.1
+BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.12.3
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
Index: ./x11/gnome-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-libs/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./x11/gnome-libs/buildlink3.mk	5 Feb 2006 23:11:33 -0000	1.8
+++ ./x11/gnome-libs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-libs
 
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
-BUILDLINK_RECOMMENDED.gnome-libs+=	gnome-libs>=1.4.2nb5
+BUILDLINK_API_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
+BUILDLINK_ABI_DEPENDS.gnome-libs+=	gnome-libs>=1.4.2nb5
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 .endif	# GNOME_LIBS_BUILDLINK3_MK
 
Index: ./x11/gnome-mag/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-mag/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/gnome-mag/buildlink3.mk	5 Feb 2006 23:11:33 -0000	1.11
+++ ./x11/gnome-mag/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-mag
 
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
-BUILDLINK_RECOMMENDED.gnome-mag?=	gnome-mag>=0.12.2nb2
+BUILDLINK_API_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
+BUILDLINK_ABI_DEPENDS.gnome-mag?=	gnome-mag>=0.12.2nb2
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
 .endif	# GNOME_MAG_BUILDLINK3_MK
 
Index: ./x11/gnome-panel/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-panel/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- ./x11/gnome-panel/Makefile	21 Mar 2006 06:00:52 -0000	1.66
+++ ./x11/gnome-panel/Makefile	4 Apr 2006 06:26:59 -0000
@@ -32,9 +32,9 @@
 GCONF2_SCHEMAS+=	window-list.schemas
 GCONF2_ENTRIES=		panel-default-setup.entries
 
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.5.0
-BUILDLINK_DEPENDS.libwnck+=	libwnck>=2.12.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.10.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.5.0
+BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.12.1
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./x11/gnome-panel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-panel/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./x11/gnome-panel/buildlink3.mk	6 Mar 2006 00:18:11 -0000	1.14
+++ ./x11/gnome-panel/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
-BUILDLINK_RECOMMENDED.gnome-panel?=	gnome-panel>=2.12.3
+BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
+BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.12.3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
Index: ./x11/gnome-session/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-session/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- ./x11/gnome-session/Makefile	21 Mar 2006 06:00:52 -0000	1.62
+++ ./x11/gnome-session/Makefile	4 Apr 2006 06:26:59 -0000
@@ -31,8 +31,8 @@
 
 # Make sure we do not use old packages that rely on XDG_{CONFIG,DATA}_DIRS
 # in the environment being set.
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.1
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.1
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./x11/gnome-themes-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome-themes-extras/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./x11/gnome-themes-extras/Makefile	6 Mar 2006 00:18:26 -0000	1.23
+++ ./x11/gnome-themes-extras/Makefile	4 Apr 2006 06:26:59 -0000
@@ -30,7 +30,7 @@
 BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
-BUILDLINK_DEPENDS.librsvg2+=	librsvg2>=2.12.6
+BUILDLINK_API_DEPENDS.librsvg2+=	librsvg2>=2.12.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
Index: ./x11/gnome2-applets/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome2-applets/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- ./x11/gnome2-applets/Makefile	21 Mar 2006 06:00:52 -0000	1.60
+++ ./x11/gnome2-applets/Makefile	4 Apr 2006 06:26:59 -0000
@@ -70,8 +70,8 @@
 # values for keys created during the registration of .schemas files.
 INSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.4.0
 
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./x11/gnome2-control-center/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome2-control-center/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- ./x11/gnome2-control-center/Makefile	21 Mar 2006 06:00:53 -0000	1.59
+++ ./x11/gnome2-control-center/Makefile	4 Apr 2006 06:26:59 -0000
@@ -42,7 +42,7 @@
 CONF_FILES+=		${EGDIR}/font-method.conf \
 			${PKG_SYSCONFDIR}/font-method.conf
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: ./x11/gnome2-control-center/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome2-control-center/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/gnome2-control-center/buildlink3.mk	5 Feb 2006 23:11:33 -0000	1.12
+++ ./x11/gnome2-control-center/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
-BUILDLINK_RECOMMENDED.gnome2-control-center?=	gnome2-control-center>=2.12.1nb5
+BUILDLINK_API_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
+BUILDLINK_ABI_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.12.1nb5
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
Index: ./x11/gnome2-terminal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnome2-terminal/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- ./x11/gnome2-terminal/Makefile	21 Mar 2006 06:00:53 -0000	1.49
+++ ./x11/gnome2-terminal/Makefile	4 Apr 2006 06:26:59 -0000
@@ -25,7 +25,7 @@
 
 GCONF2_SCHEMAS= 	gnome-terminal.schemas
 
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.8
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink3.mk"
Index: ./x11/gnopernicus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnopernicus/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- ./x11/gnopernicus/Makefile	21 Mar 2006 06:00:53 -0000	1.40
+++ ./x11/gnopernicus/Makefile	4 Apr 2006 06:26:59 -0000
@@ -50,7 +50,7 @@
 GCONF2_SCHEMAS+=	gnopernicus.schemas
 GCONF2_SCHEMAS+=	remote.schemas
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.1
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.4.1
 
 .include "../../audio/gnome-speech/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
Index: ./x11/gnustep-back/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnustep-back/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/gnustep-back/buildlink3.mk	5 Feb 2006 23:11:33 -0000	1.7
+++ ./x11/gnustep-back/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-back
 
 .if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-back+=	gnustep-back>=0.10.2nb2
+BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.10.2nb2
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 .endif	# GNUSTEP_BACK_BUILDLINK3_MK
 
Index: ./x11/gnustep-gui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnustep-gui/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/gnustep-gui/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.7
+++ ./x11/gnustep-gui/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-gui
 
 .if !empty(GNUSTEP_GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-gui+=		gnustep-gui>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-gui+=	gnustep-gui>=0.10.2nb1
+BUILDLINK_API_DEPENDS.gnustep-gui+=		gnustep-gui>=0.9.2
+BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/GNUstep\/System\/Library\/Bundles\/GSPrinting$$/ { print "@comment in x11/gnustep-gui: " $$0; next; }
Index: ./x11/gnustep-preferences/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gnustep-preferences/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/gnustep-preferences/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.3
+++ ./x11/gnustep-preferences/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gnustep-preferences
 
 .if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
-BUILDLINK_RECOMMENDED.gnustep-preferences?=	gnustep-preferences>=1.2.0nb13
+BUILDLINK_API_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
+BUILDLINK_ABI_DEPENDS.gnustep-preferences?=	gnustep-preferences>=1.2.0nb13
 BUILDLINK_PKGSRCDIR.gnustep-preferences?=	../../x11/gnustep-preferences
 .endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
Index: ./x11/gtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./x11/gtk/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.13
+++ ./x11/gtk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtk
 
 .if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
-BUILDLINK_RECOMMENDED.gtk+=	gtk+>=1.2.10nb9
+BUILDLINK_API_DEPENDS.gtk+=		gtk+>=1.2.10
+BUILDLINK_ABI_DEPENDS.gtk+=	gtk+>=1.2.10nb9
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 .endif	# GTK_BUILDLINK3_MK
 
Index: ./x11/gtk+extra/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk+extra/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/gtk+extra/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.2
+++ ./x11/gtk+extra/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtk+extra
 
 .if !empty(GTK+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
-BUILDLINK_RECOMMENDED.gtk+extra?=	gtk+extra>=0.99.17nb5
+BUILDLINK_API_DEPENDS.gtk+extra+=	gtk+extra>=0.99.17nb2
+BUILDLINK_ABI_DEPENDS.gtk+extra?=	gtk+extra>=0.99.17nb5
 BUILDLINK_PKGSRCDIR.gtk+extra?=	../../x11/gtk+extra
 .endif	# GTK+EXTRA_BUILDLINK3_MK
 
Index: ./x11/gtk2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/Makefile,v
retrieving revision 1.115
diff -u -r1.115 Makefile
--- ./x11/gtk2/Makefile	21 Mar 2006 06:00:53 -0000	1.115
+++ ./x11/gtk2/Makefile	4 Apr 2006 06:26:59 -0000
@@ -17,9 +17,9 @@
 
 BUILD_USES_MSGFMT=	yes
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.10.1
-BUILDLINK_DEPENDS.pango+=	pango>=1.10.0
-BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.10.1
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.10.0
+BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2nb2
 
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
Index: ./x11/gtk2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2/buildlink3.mk,v
retrieving revision 1.22
diff -u -r1.22 buildlink3.mk
--- ./x11/gtk2/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.22
+++ ./x11/gtk2/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtk2
 
 .if !empty(GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.4.0
-BUILDLINK_RECOMMENDED.gtk2+=	gtk2+>=2.8.11nb1
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
+BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.8.11nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0$$/ { next; }
Index: ./x11/gtk2+extra/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2+extra/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/gtk2+extra/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.3
+++ ./x11/gtk2+extra/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtk2+extra
 
 .if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
-BUILDLINK_RECOMMENDED.gtk2+extra?=	gtk2+extra>=2.1.1nb2
+BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
+BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.1nb2
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
 .endif	# GTK2+EXTRA_BUILDLINK3_MK
 
Index: ./x11/gtkglarea/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtkglarea/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/gtkglarea/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.3
+++ ./x11/gtkglarea/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkglarea
 
 .if !empty(GTKGLAREA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
-BUILDLINK_RECOMMENDED.gtkglarea?=	gtkglarea>=1.2.3nb2
+BUILDLINK_API_DEPENDS.gtkglarea+=	gtkglarea>=1.2.2nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea?=	gtkglarea>=1.2.3nb2
 BUILDLINK_PKGSRCDIR.gtkglarea?=	../../x11/gtkglarea
 .endif	# GTKGLAREA_BUILDLINK3_MK
 
Index: ./x11/gtk2-engines/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2-engines/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- ./x11/gtk2-engines/Makefile	2 Mar 2006 21:08:30 -0000	1.38
+++ ./x11/gtk2-engines/Makefile	4 Apr 2006 06:26:59 -0000
@@ -15,7 +15,7 @@
 CONFLICTS+=		gtk2-engines-industrial-[0-9]*
 CONFLICTS+=		gnome-themes-extras<0.8
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.4
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.4
 
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
Index: ./x11/gtk2-engines/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk2-engines/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/gtk2-engines/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.7
+++ ./x11/gtk2-engines/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtk2-engines
 
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
-BUILDLINK_RECOMMENDED.gtk2-engines?=	gtk2-engines>=2.6.6nb2
+BUILDLINK_API_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
+BUILDLINK_ABI_DEPENDS.gtk2-engines?=	gtk2-engines>=2.6.6nb2
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 .endif	# GTK2_ENGINES_BUILDLINK3_MK
 
Index: ./x11/gtkglarea2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtkglarea2/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/gtkglarea2/buildlink3.mk	5 Feb 2006 23:11:34 -0000	1.5
+++ ./x11/gtkglarea2/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkglarea2
 
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
-BUILDLINK_RECOMMENDED.gtkglarea2?=	gtkglarea2>=1.99.0nb6
+BUILDLINK_API_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
+BUILDLINK_ABI_DEPENDS.gtkglarea2?=	gtkglarea2>=1.99.0nb6
 BUILDLINK_PKGSRCDIR.gtkglarea2?=	../../x11/gtkglarea2
 .endif	# GTKGLAREA2_BUILDLINK3_MK
 
Index: ./x11/gtkmm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtkmm/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- ./x11/gtkmm/Makefile	14 Feb 2006 22:05:44 -0000	1.35
+++ ./x11/gtkmm/Makefile	4 Apr 2006 06:26:59 -0000
@@ -19,7 +19,7 @@
 PKGCONFIG_OVERRIDE+=	gtk/gtkmm-2.4.pc.in
 PKGCONFIG_OVERRIDE+=	pango/pangomm-1.4.pc.in
 
-BUILDLINK_DEPENDS.glibmm+=	glibmm>=2.8.0
+BUILDLINK_API_DEPENDS.glibmm+=	glibmm>=2.8.0
 
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
Index: ./x11/gtkmm/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtkmm/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/gtkmm/buildlink3.mk	5 Feb 2006 23:11:35 -0000	1.6
+++ ./x11/gtkmm/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtkmm
 
 .if !empty(GTKMM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtkmm+=	gtkmm>=2.6.3
-BUILDLINK_RECOMMENDED.gtkmm?=	gtkmm>=2.8.2nb2
+BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.6.3
+BUILDLINK_ABI_DEPENDS.gtkmm?=	gtkmm>=2.8.2nb2
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
 .endif	# GTKMM_BUILDLINK3_MK
 
Index: ./x11/gtksourceview/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtksourceview/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./x11/gtksourceview/buildlink3.mk	5 Feb 2006 23:11:35 -0000	1.8
+++ ./x11/gtksourceview/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	gtksourceview
 
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
-BUILDLINK_RECOMMENDED.gtksourceview?=	gtksourceview>=1.4.2nb2
+BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
+BUILDLINK_ABI_DEPENDS.gtksourceview?=	gtksourceview>=1.4.2nb2
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 .endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
Index: ./x11/gtoolkit/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtoolkit/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/gtoolkit/buildlink3.mk	5 Feb 2006 23:11:35 -0000	1.6
+++ ./x11/gtoolkit/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,9 +11,9 @@
 BUILDLINK_PACKAGES+=	gtoolkit
 
 .if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
-BUILDLINK_RECOMMENDED.gtoolkit+=gtoolkit>=0.9.5nb7
-BUILDLINK_RECOMMENDED.gtoolkit?=	gtoolkit>=0.9.5nb9
+BUILDLINK_API_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
+BUILDLINK_ABI_DEPENDS.gtoolkit+=gtoolkit>=0.9.5nb7
+BUILDLINK_ABI_DEPENDS.gtoolkit?=	gtoolkit>=0.9.5nb9
 BUILDLINK_PKGSRCDIR.gtoolkit?=	../../x11/gtoolkit
 .endif	# GTOOLKIT_BUILDLINK3_MK
 
Index: ./x11/kdebase3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdebase3/Makefile,v
retrieving revision 1.108
diff -u -r1.108 Makefile
--- ./x11/kdebase3/Makefile	30 Mar 2006 02:39:39 -0000	1.108
+++ ./x11/kdebase3/Makefile	4 Apr 2006 06:26:59 -0000
@@ -91,8 +91,8 @@
 
 .include "../../mk/bsd.options.mk"
 
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=${_KDE_VERSION}
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=${_KDE_VERSION}
 
 DEPENDS+=		htdig>=3.2.0:../../www/htdig-devel
 
Index: ./x11/kdebase3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdebase3/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- ./x11/kdebase3/buildlink3.mk	5 Feb 2006 23:11:38 -0000	1.15
+++ ./x11/kdebase3/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
-BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.5.1nb2
+BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
+BUILDLINK_ABI_DEPENDS.kdebase?=	kdebase>=3.5.1nb2
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
@@ -24,7 +24,7 @@
 .endif
 MAKEVARS+=	PKG_BUILD_OPTIONS.kdebase
 
-BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
+BUILDLINK_API_DEPENDS.Xrandr+=      Xrandr>=1.0
 
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
Index: ./x11/kdelibs3/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/kdelibs3/buildlink3.mk,v
retrieving revision 1.17
diff -u -r1.17 buildlink3.mk
--- ./x11/kdelibs3/buildlink3.mk	9 Mar 2006 21:04:45 -0000	1.17
+++ ./x11/kdelibs3/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	kdelibs
 
 .if !empty(KDELIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.2.0
-BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.5.1nb1
+BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs>=3.2.0
+BUILDLINK_ABI_DEPENDS.kdelibs?=	kdelibs>=3.5.1nb1
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
 
 .include "../../x11/kdelibs3/dirs.mk"
Index: ./x11/lablgtk/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lablgtk/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ./x11/lablgtk/Makefile	4 Mar 2006 21:31:09 -0000	1.25
+++ ./x11/lablgtk/Makefile	4 Apr 2006 06:26:59 -0000
@@ -12,7 +12,7 @@
 USE_TOOLS+=	gmake
 
 BUILDLINK_DEPMETHOD.ocaml=	full
-BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.0.5
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.0.5
 
 .include "../../mk/bsd.prefs.mk"
 
Index: ./x11/lablgtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lablgtk/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/lablgtk/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.4
+++ ./x11/lablgtk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lablgtk
 
 .if !empty(LABLGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
-BUILDLINK_RECOMMENDED.lablgtk?=	lablgtk>=1.2.7nb2
+BUILDLINK_API_DEPENDS.lablgtk+=	lablgtk>=1.2.5nb3
+BUILDLINK_ABI_DEPENDS.lablgtk?=	lablgtk>=1.2.7nb2
 BUILDLINK_PKGSRCDIR.lablgtk?=	../../x11/lablgtk
 .endif	# LABLGTK_BUILDLINK3_MK
 
Index: ./x11/lablgtk2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lablgtk2/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/lablgtk2/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.7
+++ ./x11/lablgtk2/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
-BUILDLINK_RECOMMENDED.lablgtk2?=	lablgtk2>=2.6.0nb5
+BUILDLINK_API_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
+BUILDLINK_ABI_DEPENDS.lablgtk2?=	lablgtk2>=2.6.0nb5
 BUILDLINK_PKGSRCDIR.lablgtk2?=	../../x11/lablgtk2
 .endif	# LABLGTK2_BUILDLINK3_MK
 
Index: ./x11/lesstif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/lesstif/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/lesstif/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.6
+++ ./x11/lesstif/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	lesstif
 
 .if !empty(LESSTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lesstif+=	lesstif>=0.91.4
-BUILDLINK_RECOMMENDED.lesstif+=	lesstif>=0.94.4nb2
+BUILDLINK_API_DEPENDS.lesstif+=	lesstif>=0.91.4
+BUILDLINK_ABI_DEPENDS.lesstif+=	lesstif>=0.94.4nb2
 BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
 .endif	# LESSTIF_BUILDLINK3_MK
 
Index: ./x11/libexo/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libexo/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/libexo/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.4
+++ ./x11/libexo/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	exo
 
 .if !empty(EXO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.exo+=		exo>=0.3.0
-BUILDLINK_RECOMMENDED.exo?=	exo>=0.3.0nb2
+BUILDLINK_API_DEPENDS.exo+=		exo>=0.3.0
+BUILDLINK_ABI_DEPENDS.exo?=	exo>=0.3.0nb2
 BUILDLINK_PKGSRCDIR.exo?=	../../x11/libexo
 .endif	# EXO_BUILDLINK3_MK
 
Index: ./x11/libxfce4gui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxfce4gui/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./x11/libxfce4gui/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.13
+++ ./x11/libxfce4gui/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxfce4gui
 
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4gui?=	libxfce4gui>=4.2.3nb2
+BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4gui?=	libxfce4gui>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
Index: ./x11/libxfce4mcs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxfce4mcs/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/libxfce4mcs/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.12
+++ ./x11/libxfce4mcs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxfce4mcs
 
 .if !empty(LIBXFCE4MCS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
-BUILDLINK_RECOMMENDED.libxfce4mcs?=	libxfce4mcs>=4.2.3nb1
+BUILDLINK_API_DEPENDS.libxfce4mcs+=	libxfce4mcs>=4.2.3
+BUILDLINK_ABI_DEPENDS.libxfce4mcs?=	libxfce4mcs>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4mcs?=	../../x11/libxfce4mcs
 .endif	# LIBXFCE4MCS_BUILDLINK3_MK
 
Index: ./x11/libxfce4util/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxfce4util/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/libxfce4util/buildlink3.mk	17 Feb 2006 06:49:25 -0000	1.12
+++ ./x11/libxfce4util/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxfce4util
 
 .if !empty(LIBXFCE4UTIL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
-BUILDLINK_RECOMMENDED.libxfce4util?=	libxfce4util>=4.2.3.2nb1
+BUILDLINK_API_DEPENDS.libxfce4util+=	libxfce4util>=4.2.3.2
+BUILDLINK_ABI_DEPENDS.libxfce4util?=	libxfce4util>=4.2.3.2nb1
 BUILDLINK_PKGSRCDIR.libxfce4util?=	../../x11/libxfce4util
 .endif	# LIBXFCE4UTIL_BUILDLINK3_MK
 
Index: ./x11/libxklavier/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libxklavier/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./x11/libxklavier/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.8
+++ ./x11/libxklavier/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libxklavier
 
 .if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libxklavier+=		libxklavier>=2.0
-BUILDLINK_RECOMMENDED.libxklavier?=	libxklavier>=2.0nb1
+BUILDLINK_API_DEPENDS.libxklavier+=		libxklavier>=2.0
+BUILDLINK_ABI_DEPENDS.libxklavier?=	libxklavier>=2.0nb1
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
 .endif	# LIBXKLAVIER_BUILDLINK3_MK
 
Index: ./x11/libzvt/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/libzvt/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/libzvt/buildlink3.mk	5 Feb 2006 23:11:39 -0000	1.6
+++ ./x11/libzvt/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	libzvt
 
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
-BUILDLINK_RECOMMENDED.libzvt+=	libzvt>=2.0.1nb8
+BUILDLINK_API_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
+BUILDLINK_ABI_DEPENDS.libzvt+=	libzvt>=2.0.1nb8
 BUILDLINK_PKGSRCDIR.libzvt?=	../../x11/libzvt
 .endif	# LIBZVT_BUILDLINK3_MK
 
Index: ./x11/mowitz/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/mowitz/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/mowitz/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.3
+++ ./x11/mowitz/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	Mowitz
 
 .if !empty(MOWITZ_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Mowitz+=	Mowitz>=0.2.1
-BUILDLINK_RECOMMENDED.Mowitz+=	Mowitz>=0.2.2nb2
+BUILDLINK_API_DEPENDS.Mowitz+=	Mowitz>=0.2.1
+BUILDLINK_ABI_DEPENDS.Mowitz+=	Mowitz>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.Mowitz?=	../../x11/mowitz
 .endif	# MOWITZ_BUILDLINK3_MK
 
Index: ./x11/neXtaw/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/neXtaw/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/neXtaw/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.5
+++ ./x11/neXtaw/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	neXtaw
 
 .if !empty(NEXTAW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.neXtaw+=	neXtaw>=0.15.1
-BUILDLINK_RECOMMENDED.neXtaw+=	neXtaw>=0.15.1nb2
+BUILDLINK_API_DEPENDS.neXtaw+=	neXtaw>=0.15.1
+BUILDLINK_ABI_DEPENDS.neXtaw+=	neXtaw>=0.15.1nb2
 BUILDLINK_PKGSRCDIR.neXtaw?=	../../x11/neXtaw
 .endif	# NEXTAW_BUILDLINK3_MK
 
Index: ./x11/ocaml-graphics/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/ocaml-graphics/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/ocaml-graphics/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.3
+++ ./x11/ocaml-graphics/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	ocaml-graphics
 
 .if !empty(OCAML_GRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
-BUILDLINK_RECOMMENDED.ocaml-graphics?=	ocaml-graphics>=3.09.1
+BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
+BUILDLINK_ABI_DEPENDS.ocaml-graphics?=	ocaml-graphics>=3.09.1
 BUILDLINK_PKGSRCDIR.ocaml-graphics?=	../../x11/ocaml-graphics
 .endif	# OCAML_GRAPHICS_BUILDLINK3_MK
 
Index: ./x11/openmotif/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/openmotif/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/openmotif/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.4
+++ ./x11/openmotif/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	openmotif
 
 .if !empty(OPENMOTIF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openmotif+=	openmotif>=2.2.3
-BUILDLINK_RECOMMENDED.openmotif?=	openmotif>=2.2.3nb2
+BUILDLINK_API_DEPENDS.openmotif+=	openmotif>=2.2.3
+BUILDLINK_ABI_DEPENDS.openmotif?=	openmotif>=2.2.3nb2
 BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
 .endif	# OPENMOTIF_BUILDLINK3_MK
 
Index: ./x11/paragui/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/paragui/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./x11/paragui/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.10
+++ ./x11/paragui/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	paragui
 
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.paragui+=	paragui>=1.0.4nb3
-BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb10
+BUILDLINK_API_DEPENDS.paragui+=	paragui>=1.0.4nb3
+BUILDLINK_ABI_DEPENDS.paragui+=	paragui>=1.0.4nb10
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 .endif	# PARAGUI_BUILDLINK3_MK
 
Index: ./x11/py-Pmw/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-Pmw/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/py-Pmw/buildlink3.mk	5 Feb 2006 23:11:40 -0000	1.2
+++ ./x11/py-Pmw/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pypmw
 
 .if !empty(PY_PMW_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
-BUILDLINK_RECOMMENDED.pypmw?=	${PYPKGPREFIX}-Pmw>=1.2nb1
+BUILDLINK_API_DEPENDS.pypmw+=	${PYPKGPREFIX}-Pmw-[0-9]*
+BUILDLINK_ABI_DEPENDS.pypmw?=	${PYPKGPREFIX}-Pmw>=1.2nb1
 BUILDLINK_PKGSRCDIR.pypmw?=	../../x11/py-Pmw
 .endif	# PY_PMW_BUILDLINK3_MK
 
Index: ./x11/py-Tk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-Tk/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/py-Tk/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.2
+++ ./x11/py-Tk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	pytk
 
 .if !empty(PYTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
-BUILDLINK_RECOMMENDED.pytk?=	${PYPKGPREFIX}-Tk>=0nb4
+BUILDLINK_API_DEPENDS.pytk+=	${PYPKGPREFIX}-Tk-[0-9]*
+BUILDLINK_ABI_DEPENDS.pytk?=	${PYPKGPREFIX}-Tk>=0nb4
 BUILDLINK_PKGSRCDIR.pytk?=	../../x11/py-Tk
 .endif	# PYTK_BUILDLINK3_MK
 
Index: ./x11/py-Xlib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-Xlib/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/py-Xlib/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.4
+++ ./x11/py-Xlib/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	py-Xlib
 
 .if !empty(PY_XLIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
-BUILDLINK_RECOMMENDED.py-Xlib?=	${PYPKGPREFIX}-Xlib>=0.12nb1
+BUILDLINK_API_DEPENDS.py-Xlib+=	${PYPKGPREFIX}-Xlib>=0.12
+BUILDLINK_ABI_DEPENDS.py-Xlib?=	${PYPKGPREFIX}-Xlib>=0.12nb1
 BUILDLINK_PKGSRCDIR.py-Xlib?=	../../x11/py-Xlib
 .endif	# PY_XLIB_BUILDLINK3_MK
 
Index: ./x11/py-gnome2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gnome2/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- ./x11/py-gnome2/Makefile	6 Mar 2006 00:18:27 -0000	1.34
+++ ./x11/py-gnome2/Makefile	4 Apr 2006 06:26:59 -0000
@@ -24,18 +24,18 @@
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 
-BUILDLINK_DEPENDS.GConf2+=	GConf2>=2.11.1
+BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.11.1
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-BUILDLINK_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
+BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
 .include "../../net/py-ORBit/buildlink3.mk"
-BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.0
+BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.0
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
+BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
 .include "../../x11/py-gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
Index: ./x11/py-gnome2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gnome2/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./x11/py-gnome2/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.13
+++ ./x11/py-gnome2/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pygnome2
 
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_RECOMMENDED.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb3
+BUILDLINK_API_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
+BUILDLINK_ABI_DEPENDS.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb3
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 .endif	# PY_GNOME2_BUILDLINK3_MK
 
Index: ./x11/py-gnome2-extras/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gnome2-extras/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./x11/py-gnome2-extras/Makefile	6 Mar 2006 00:18:27 -0000	1.12
+++ ./x11/py-gnome2-extras/Makefile	4 Apr 2006 06:26:59 -0000
@@ -21,7 +21,7 @@
 
 PYTHON_VERSIONS_ACCEPTED=	24 23
 
-BUILDLINK_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.11.1
+BUILDLINK_API_DEPENDS.nautilus-cd-burner+=	nautilus-cd-burner>=2.11.1
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
Index: ./x11/py-gnome2-extras/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gnome2-extras/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/py-gnome2-extras/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.6
+++ ./x11/py-gnome2-extras/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pygnome2ex
 
 .if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_RECOMMENDED.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
+BUILDLINK_API_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
+BUILDLINK_ABI_DEPENDS.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb5
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 .endif	# PY_GNOME2EX_BUILDLINK3_MK
 
Index: ./x11/py-gtk2/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-gtk2/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- ./x11/py-gtk2/buildlink3.mk	7 Feb 2006 21:27:28 -0000	1.13
+++ ./x11/py-gtk2/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,7 +13,7 @@
 BUILDLINK_PACKAGES+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
+BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 .endif	# PY_GTK2_BUILDLINK3_MK
 
Index: ./x11/py-qt2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt2/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./x11/py-qt2/Makefile	2 Mar 2006 21:53:52 -0000	1.19
+++ ./x11/py-qt2/Makefile	4 Apr 2006 06:26:59 -0000
@@ -24,7 +24,7 @@
 
 # MesaLib is pulled in through qt2-libs; we need a version
 # which doesn't (needlessly) link to libpthread
-BUILDLINK_DEPENDS.MesaLib+=	MesaLib>=6.4.2nb1
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=6.4.2nb1
 
 .include "../../lang/python/extension.mk"
 
Index: ./x11/py-qt2-sip/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt2-sip/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/py-qt2-sip/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.4
+++ ./x11/py-qt2-sip/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyqt2sip
 
 .if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
-BUILDLINK_RECOMMENDED.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb3
+BUILDLINK_API_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
+BUILDLINK_ABI_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb3
 BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
 .endif	# PY_QT2_SIP_BUILDLINK3_MK
 
Index: ./x11/py-qt3-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt3-base/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- ./x11/py-qt3-base/Makefile	10 Feb 2006 10:45:02 -0000	1.22
+++ ./x11/py-qt3-base/Makefile	4 Apr 2006 06:26:59 -0000
@@ -8,7 +8,7 @@
 
 COMMENT=		Python binding for Qt3
 
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb2
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb2
 
 PLIST_SRC=		${PKGDIR}/PLIST.common
 .if ${OPSYS} == "Darwin"
Index: ./x11/py-qt3-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt3-base/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/py-qt3-base/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.3
+++ ./x11/py-qt3-base/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyqt3-base
 
 .if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1nb2
 BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
Index: ./x11/py-qt3-modules/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt3-modules/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/py-qt3-modules/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.3
+++ ./x11/py-qt3-modules/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyqt3-mod
 
 .if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_RECOMMENDED.pyqt3-mod?=	${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
+BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
+BUILDLINK_ABI_DEPENDS.pyqt3-mod?=	${PYPKGPREFIX}-qt3-modules>=3.15.1nb2
 BUILDLINK_PKGSRCDIR.pyqt3-mod?=	../../x11/py-qt3-modules
 
 BUILDLINK_LIBDIRS.pyqt3-mod+=	${PYSITELIB}
Index: ./x11/py-qt3-sip/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt3-sip/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/py-qt3-sip/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.4
+++ ./x11/py-qt3-sip/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pyqt3-sip
 
 .if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
-BUILDLINK_RECOMMENDED.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
+BUILDLINK_API_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
+BUILDLINK_ABI_DEPENDS.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb2
 BUILDLINK_PKGSRCDIR.pyqt3-sip?=	../../x11/py-qt3-sip
 
 BUILDLINK_LIBDIRS.pyqt3-sip+=	${PYSITELIB}
Index: ./x11/py-wxWidgets/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-wxWidgets/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/py-wxWidgets/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.5
+++ ./x11/py-wxWidgets/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-wxWidgets
 
 .if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
+BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb3
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK/buildlink3.mk"
Index: ./x11/pygtk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/pygtk/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/pygtk/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.3
+++ ./x11/pygtk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	pygtk
 
 .if !empty(PY_GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.9nb4
-BUILDLINK_RECOMMENDED.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.11nb2
+BUILDLINK_API_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.9nb4
+BUILDLINK_ABI_DEPENDS.pygtk+=	${PYPKGPREFIX}-gtk>=0.6.11nb2
 BUILDLINK_PKGSRCDIR.pygtk?=	../../x11/pygtk
 .endif	# PY_GTK_BUILDLINK3_MK
 
Index: ./x11/qt1/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt1/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/qt1/buildlink3.mk	5 Feb 2006 23:11:41 -0000	1.4
+++ ./x11/qt1/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt1
 
 .if !empty(QT1_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt1+=		qt1>=1.44
-BUILDLINK_RECOMMENDED.qt1+=	qt1>=1.44nb3
+BUILDLINK_API_DEPENDS.qt1+=		qt1>=1.44
+BUILDLINK_ABI_DEPENDS.qt1+=	qt1>=1.44nb3
 BUILDLINK_PKGSRCDIR.qt1?=	../../x11/qt1
 
 BUILDLINK_PASSTHRU_DIRS=	${LOCALBASE}/qt1
Index: ./x11/qt2-designer/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt2-designer/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/qt2-designer/buildlink3.mk	5 Feb 2006 23:11:42 -0000	1.4
+++ ./x11/qt2-designer/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt2-designer
 
 .if !empty(QT2_DESIGNER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-designer+=	qt2-designer>=2.3.1nb5
+BUILDLINK_API_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb5
 BUILDLINK_PKGSRCDIR.qt2-designer?=	../../x11/qt2-designer
 .endif	# QT2_DESIGNER_BUILDLINK3_MK
 
Index: ./x11/qt2-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt2-libs/buildlink3.mk,v
retrieving revision 1.6
diff -u -r1.6 buildlink3.mk
--- ./x11/qt2-libs/buildlink3.mk	5 Feb 2006 23:11:42 -0000	1.6
+++ ./x11/qt2-libs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt2-libs
 
 .if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-libs+=	qt2-libs>=2.3.1nb8
+BUILDLINK_API_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
+BUILDLINK_ABI_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb8
 BUILDLINK_PKGSRCDIR.qt2-libs?=	../../x11/qt2-libs
 BUILDLINK_INCDIRS.qt2-libs=	qt2/include
 BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
Index: ./x11/qt3-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/qt3-libs/buildlink3.mk	17 Feb 2006 23:24:17 -0000	1.11
+++ ./x11/qt3-libs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt3-libs
 
 .if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
-BUILDLINK_RECOMMENDED.qt3-libs?=	qt3-libs>=3.3.5nb4
+BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
+BUILDLINK_ABI_DEPENDS.qt3-libs?=	qt3-libs>=3.3.5nb4
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
Index: ./x11/qt3-qscintilla/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-qscintilla/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/qt3-qscintilla/buildlink3.mk	5 Feb 2006 23:11:42 -0000	1.4
+++ ./x11/qt3-qscintilla/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt3-qscintilla
 
 .if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
-BUILDLINK_RECOMMENDED.qt3-qscintilla+=	qt3-qscintilla>=1.6nb2
+BUILDLINK_API_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
+BUILDLINK_ABI_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.6nb2
 BUILDLINK_PKGSRCDIR.qt3-qscintilla?=	../../x11/qt3-qscintilla
 .endif	# QT3_QSCINTILLA_BUILDLINK3_MK
 
Index: ./x11/qt3-tools/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-tools/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./x11/qt3-tools/buildlink3.mk	17 Feb 2006 23:26:26 -0000	1.9
+++ ./x11/qt3-tools/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	qt3-tools
 
 .if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
-BUILDLINK_RECOMMENDED.qt3-tools+=	qt3-tools>=3.3.5nb3
+BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
+BUILDLINK_ABI_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb3
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 BUILDLINK_DEPMETHOD.qt3-tools?=	build
 .endif	# QT3_TOOLS_BUILDLINK3_MK
Index: ./x11/qt4-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-libs/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/qt4-libs/buildlink3.mk	25 Feb 2006 09:25:00 -0000	1.2
+++ ./x11/qt4-libs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	qt4-libs
 
 .if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.1.0
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
Index: ./x11/qt4-tools/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt4-tools/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./x11/qt4-tools/buildlink3.mk	20 Feb 2006 12:09:01 -0000	1.1.1.1
+++ ./x11/qt4-tools/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	qt4-tools
 
 .if !empty(QT4_TOOLS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
+BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
 BUILDLINK_PKGSRCDIR.qt4-tools?=	../../x11/qt4-tools
 BUILDLINK_DEPMETHOD.qt4-tools?=	build
 .endif	# QT4_TOOLS_BUILDLINK3_MK
Index: ./x11/randrext/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/randrext/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/randrext/buildlink3.mk	5 Feb 2006 23:11:42 -0000	1.7
+++ ./x11/randrext/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	randrext
 
 .if !empty(RANDREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
-BUILDLINK_RECOMMENDED.randrext?=	randrext>=1.0nb2
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_ABI_DEPENDS.randrext?=	randrext>=1.0nb2
 BUILDLINK_PKGSRCDIR.randrext?=	../../x11/randrext
 BUILDLINK_DEPMETHOD.randrext?=	build
 .endif	# RANDREXT_BUILDLINK3_MK
Index: ./x11/randrext/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/randrext/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./x11/randrext/builtin.mk	1 Jun 2005 18:03:30 -0000	1.3
+++ ./x11/randrext/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -52,7 +52,7 @@
 .    if defined(BUILTIN_PKG.randrext) && \
         !empty(IS_BUILTIN.randrext:M[yY][eE][sS])
 USE_BUILTIN.randrext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.randrext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.randrext}
 .        if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
 USE_BUILTIN.randrext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.randrext:Q}; then \
@@ -75,7 +75,7 @@
 .if !empty(CHECK_BUILTIN.randrext:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.randrext:M[nN][oO])
-BUILDLINK_DEPENDS.randrext+=	randrext>=1.0
+BUILDLINK_API_DEPENDS.randrext+=	randrext>=1.0
 .  endif
 
 .  if !empty(USE_BUILTIN.randrext:M[yY][eE][sS])
Index: ./x11/renderext/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/renderext/buildlink3.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 buildlink3.mk
--- ./x11/renderext/buildlink3.mk	15 Oct 2005 16:36:57 -0000	1.1.1.1
+++ ./x11/renderext/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=	renderext
 
 .if !empty(RENDEREXT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.renderext+=	renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+=	renderext>=0.9
 BUILDLINK_PKGSRCDIR.renderext?=	../../x11/renderext
 BUILDLINK_DEPMETHOD.renderext?=	build
 .endif	# RENDEREXT_BUILDLINK3_MK
Index: ./x11/renderext/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/renderext/builtin.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 builtin.mk
--- ./x11/renderext/builtin.mk	15 Oct 2005 16:36:57 -0000	1.1.1.1
+++ ./x11/renderext/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -52,7 +52,7 @@
 .    if defined(BUILTIN_PKG.renderext) && \
         !empty(IS_BUILTIN.renderext:M[yY][eE][sS])
 USE_BUILTIN.renderext=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.renderext}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.renderext}
 .        if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
 USE_BUILTIN.renderext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.renderext:Q}; then \
@@ -75,7 +75,7 @@
 .if !empty(CHECK_BUILTIN.renderext:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.renderext:M[nN][oO])
-BUILDLINK_DEPENDS.renderext+=	renderext>=0.9
+BUILDLINK_API_DEPENDS.renderext+=	renderext>=0.9
 .  endif
 
 .  if !empty(USE_BUILTIN.renderext:M[yY][eE][sS])
Index: ./x11/startup-notification/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/startup-notification/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/startup-notification/buildlink3.mk	5 Feb 2006 23:11:43 -0000	1.4
+++ ./x11/startup-notification/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	startup-notification
 
 .if !empty(STARTUP_NOTIFICATION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.startup-notification+=	startup-notification>=0.5
-BUILDLINK_RECOMMENDED.startup-notification+=	startup-notification>=0.8nb1
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.5
+BUILDLINK_ABI_DEPENDS.startup-notification+=	startup-notification>=0.8nb1
 BUILDLINK_PKGSRCDIR.startup-notification?=	../../x11/startup-notification
 .endif	# STARTUP_NOTIFICATION_BUILDLINK3_MK
 
Index: ./x11/tk/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./x11/tk/buildlink3.mk	5 Feb 2006 23:11:43 -0000	1.16
+++ ./x11/tk/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+=		tk>=8.4.6nb1
-BUILDLINK_RECOMMENDED.tk+=	tk>=8.4.12nb1
+BUILDLINK_API_DEPENDS.tk+=		tk>=8.4.6nb1
+BUILDLINK_ABI_DEPENDS.tk+=	tk>=8.4.12nb1
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk=	bin/wish*
Index: ./x11/tk-BWidget/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk-BWidget/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/tk-BWidget/buildlink3.mk	5 Feb 2006 23:11:43 -0000	1.2
+++ ./x11/tk-BWidget/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -12,8 +12,8 @@
 BUILDLINK_PACKAGES+=	tk-BWidget
 
 .if !empty(TK_BWIDGET_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
-BUILDLINK_RECOMMENDED.tk-BWidget?=	tk-BWidget>=1.7.0nb1
+BUILDLINK_API_DEPENDS.tk-BWidget+=	tk-BWidget>=1.7.0
+BUILDLINK_ABI_DEPENDS.tk-BWidget?=	tk-BWidget>=1.7.0nb1
 BUILDLINK_PKGSRCDIR.tk-BWidget?=	../../x11/tk-BWidget
 .endif	# TK_BWIDGET_BUILDLINK3_MK
 
Index: ./x11/tk83/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk83/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/tk83/buildlink3.mk	5 Feb 2006 23:11:43 -0000	1.5
+++ ./x11/tk83/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+=		tk-8.3.4*
-BUILDLINK_RECOMMENDED.tk?=	tk>=8.3.4nb2
+BUILDLINK_API_DEPENDS.tk+=		tk-8.3.4*
+BUILDLINK_ABI_DEPENDS.tk?=	tk>=8.3.4nb2
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk83
 
 BUILDLINK_FILES.tk=	bin/wish*
Index: ./x11/vte/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/vte/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ./x11/vte/Makefile	4 Mar 2006 21:31:11 -0000	1.29
+++ ./x11/vte/Makefile	4 Apr 2006 06:26:59 -0000
@@ -26,7 +26,7 @@
 PKGCONFIG_OVERRIDE+=    vte.pc.in
 
 # for FC_WIDTH
-BUILDLINK_DEPENDS.fontconfig+=      fontconfig>=2.1.93
+BUILDLINK_API_DEPENDS.fontconfig+=      fontconfig>=2.1.93
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
Index: ./x11/vte/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/vte/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./x11/vte/buildlink3.mk	5 Feb 2006 23:11:44 -0000	1.9
+++ ./x11/vte/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	vte
 
 .if !empty(VTE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.vte+=		vte>=0.11.11
-BUILDLINK_RECOMMENDED.vte+=	vte>=0.11.15nb2
+BUILDLINK_API_DEPENDS.vte+=		vte>=0.11.11
+BUILDLINK_ABI_DEPENDS.vte+=	vte>=0.11.15nb2
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
 .endif	# VTE_BUILDLINK3_MK
 
Index: ./x11/wxGTK/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxGTK/buildlink3.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink3.mk
--- ./x11/wxGTK/buildlink3.mk	5 Feb 2006 23:11:44 -0000	1.10
+++ ./x11/wxGTK/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	wxGTK
 
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK+=	wxGTK>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK?=	wxGTK>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK?=	wxGTK>=2.6.2nb2
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 .endif	# WXGTK_BUILDLINK3_MK
 
Index: ./x11/wxGTK-contrib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxGTK-contrib/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/wxGTK-contrib/buildlink3.mk	5 Feb 2006 23:11:44 -0000	1.5
+++ ./x11/wxGTK-contrib/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	wxGTK-contrib
 
 .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
-BUILDLINK_RECOMMENDED.wxGTK-contrib?=	wxGTK-contrib>=2.6.2nb2
+BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
+BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.2nb2
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK-contrib
 
 .include "../../devel/zlib/buildlink3.mk"
Index: ./x11/wxGTK24/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/wxGTK24/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/wxGTK24/buildlink3.mk	5 Feb 2006 23:11:44 -0000	1.3
+++ ./x11/wxGTK24/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -13,8 +13,8 @@
 BUILDLINK_PACKAGES+=	wxGTK24
 
 .if !empty(WXGTK24_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
-BUILDLINK_RECOMMENDED.wxGTK24?=	wxGTK24>=2.4.2nb9
+BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
+BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb9
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 .endif	# WXGTK24_BUILDLINK3_MK
 
Index: ./x11/xcursor/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xcursor/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./x11/xcursor/Makefile	4 Mar 2006 21:31:12 -0000	1.18
+++ ./x11/xcursor/Makefile	4 Apr 2006 06:26:59 -0000
@@ -21,7 +21,7 @@
 
 PKGCONFIG_OVERRIDE+=    xcursor.pc.in
 
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
 .include "../../x11/Xfixes/buildlink3.mk"
 .include "../../x11/Xrender/buildlink3.mk"
Index: ./x11/xcursor/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xcursor/buildlink3.mk,v
retrieving revision 1.16
diff -u -r1.16 buildlink3.mk
--- ./x11/xcursor/buildlink3.mk	5 Feb 2006 23:11:45 -0000	1.16
+++ ./x11/xcursor/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xcursor
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.0
-BUILDLINK_RECOMMENDED.xcursor+=	xcursor>=1.1.2nb1
+BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.0
+BUILDLINK_ABI_DEPENDS.xcursor+=	xcursor>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
 .endif	# XCURSOR_BUILDLINK3_MK
 
Index: ./x11/xcursor/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xcursor/builtin.mk,v
retrieving revision 1.10
diff -u -r1.10 builtin.mk
--- ./x11/xcursor/builtin.mk	4 Dec 2005 01:46:45 -0000	1.10
+++ ./x11/xcursor/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -57,7 +57,7 @@
 .    if defined(BUILTIN_PKG.xcursor) && \
         !empty(IS_BUILTIN.xcursor:M[yY][eE][sS])
 USE_BUILTIN.xcursor=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xcursor}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xcursor}
 .        if !empty(USE_BUILTIN.xcursor:M[yY][eE][sS])
 USE_BUILTIN.xcursor!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xcursor:Q}; then \
@@ -80,8 +80,8 @@
 .if !empty(CHECK_BUILTIN.xcursor:M[nN][oO])
 
 .  if !empty(USE_BUILTIN.xcursor:M[nN][oO])
-BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
-BUILDLINK_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_API_DEPENDS.xcursor+=	xcursor>=1.1.1
+BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .    for _mkfile_ in buildlink3.mk builtin.mk
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 .      sinclude "../../x11/Xfixes/${_mkfile_}"
Index: ./x11/xextensions/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xextensions/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/xextensions/buildlink3.mk	8 May 2004 21:57:04 -0000	1.2
+++ ./x11/xextensions/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -14,7 +14,7 @@
 BUILDLINK_PACKAGES+=	xextensions
 
 .if !empty(XEXTENSIONS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xextensions?=		xextensions>=1.0
+BUILDLINK_API_DEPENDS.xextensions?=		xextensions>=1.0
 BUILDLINK_PKGSRCDIR.xextensions?=	../../x11/xextensions
 BUILDLINK_DEPMETHOD.xextensions?=	build
 .endif # XEXTENSIONS_BUILDLINK3_MK
Index: ./x11/xextensions/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xextensions/builtin.mk,v
retrieving revision 1.8
diff -u -r1.8 builtin.mk
--- ./x11/xextensions/builtin.mk	9 Oct 2005 21:43:02 -0000	1.8
+++ ./x11/xextensions/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -37,7 +37,7 @@
 .    if defined(BUILTIN_PKG.xextensions) && \
         !empty(IS_BUILTIN.xextensions:M[yY][eE][sS])
 USE_BUILTIN.xextensions=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xextensions}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xextensions}
 .        if !empty(USE_BUILTIN.xextensions:M[yY][eE][sS])
 USE_BUILTIN.xextensions!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xextensions:Q}; then \
Index: ./x11/xfce4-clipman-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-clipman-plugin/buildlink3.mk,v
retrieving revision 1.8
diff -u -r1.8 buildlink3.mk
--- ./x11/xfce4-clipman-plugin/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.8
+++ ./x11/xfce4-clipman-plugin/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
 
 .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
-BUILDLINK_RECOMMENDED.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb2
+BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
+BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 .endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
Index: ./x11/xfce4-desktop/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-desktop/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/xfce4-desktop/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.12
+++ ./x11/xfce4-desktop/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-desktop
 
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-desktop?=	xfce4-desktop>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-desktop?=	xfce4-desktop>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
Index: ./x11/xfce4-gtk2-engine/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-gtk2-engine/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/xfce4-gtk2-engine/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.4
+++ ./x11/xfce4-gtk2-engine/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
-BUILDLINK_RECOMMENDED.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb2
+BUILDLINK_API_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
+BUILDLINK_ABI_DEPENDS.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb2
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
 .endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
Index: ./x11/xfce4-mcs-manager/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-mcs-manager/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/xfce4-mcs-manager/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.11
+++ ./x11/xfce4-mcs-manager/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
Index: ./x11/xfce4-mcs-plugins/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-mcs-plugins/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/xfce4-mcs-plugins/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.11
+++ ./x11/xfce4-mcs-plugins/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
Index: ./x11/xfce4-notes-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-notes-plugin/buildlink3.mk,v
retrieving revision 1.9
diff -u -r1.9 buildlink3.mk
--- ./x11/xfce4-notes-plugin/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.9
+++ ./x11/xfce4-notes-plugin/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 
 .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
-BUILDLINK_RECOMMENDED.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb2
+BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
+BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
Index: ./x11/xfce4-panel/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-panel/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/xfce4-panel/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.12
+++ ./x11/xfce4-panel/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-panel?=	xfce4-panel>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-panel?=	xfce4-panel>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
Index: ./x11/xfce4-session/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-session/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/xfce4-session/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.7
+++ ./x11/xfce4-session/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-session
 
 .if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-session?=	xfce4-session>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-session?=	xfce4-session>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
Index: ./x11/xfce4-taskbar-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-taskbar-plugin/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- ./x11/xfce4-taskbar-plugin/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.7
+++ ./x11/xfce4-taskbar-plugin/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-taskbar-plugin
 
 .if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
-BUILDLINK_RECOMMENDED.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb2
+BUILDLINK_API_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
+BUILDLINK_ABI_DEPENDS.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?=	../../x11/xfce4-taskbar-plugin
 .endif	# XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK
 
Index: ./x11/xfce4-toys/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-toys/buildlink3.mk,v
retrieving revision 1.11
diff -u -r1.11 buildlink3.mk
--- ./x11/xfce4-toys/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.11
+++ ./x11/xfce4-toys/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-toys
 
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-toys?=	xfce4-toys>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-toys?=	xfce4-toys>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .endif	# XFCE4_TOYS_BUILDLINK3_MK
 
Index: ./x11/xfce4-trigger-launcher/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-trigger-launcher/buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 buildlink3.mk
--- ./x11/xfce4-trigger-launcher/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.12
+++ ./x11/xfce4-trigger-launcher/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb2
+BUILDLINK_API_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
Index: ./x11/xfce4-utils/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-utils/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./x11/xfce4-utils/buildlink3.mk	20 Mar 2006 06:29:09 -0000	1.14
+++ ./x11/xfce4-utils/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-utils
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-utils?=	xfce4-utils>=4.2.3nb3
+BUILDLINK_API_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
+BUILDLINK_ABI_DEPENDS.xfce4-utils?=	xfce4-utils>=4.2.3nb3
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
Index: ./x11/xfce4-windowlist-plugin/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xfce4-windowlist-plugin/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/xfce4-windowlist-plugin/buildlink3.mk	17 Feb 2006 06:49:26 -0000	1.5
+++ ./x11/xfce4-windowlist-plugin/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xfce4-windowlist-plugin
 
 .if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
-BUILDLINK_RECOMMENDED.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb3
+BUILDLINK_API_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb3
 BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?=	../../x11/xfce4-windowlist-plugin
 .endif	# XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK
 
Index: ./x11/xforms/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xforms/buildlink3.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink3.mk
--- ./x11/xforms/buildlink3.mk	5 Feb 2006 23:11:47 -0000	1.3
+++ ./x11/xforms/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xforms
 
 .if !empty(XFORMS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xforms+=	xforms>=1.0nb2
-BUILDLINK_RECOMMENDED.xforms+=	xforms>=1.0nb5
+BUILDLINK_API_DEPENDS.xforms+=	xforms>=1.0nb2
+BUILDLINK_ABI_DEPENDS.xforms+=	xforms>=1.0nb5
 BUILDLINK_PKGSRCDIR.xforms?=	../../x11/xforms
 .endif	# XFORMS_BUILDLINK3_MK
 
Index: ./x11/xorg-libs/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-libs/buildlink3.mk,v
retrieving revision 1.14
diff -u -r1.14 buildlink3.mk
--- ./x11/xorg-libs/buildlink3.mk	23 Feb 2006 23:17:30 -0000	1.14
+++ ./x11/xorg-libs/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -18,8 +18,8 @@
 
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.9.0
-BUILDLINK_RECOMMENDED.xorg-libs?=	xorg-libs>=6.9.0nb2
+BUILDLINK_API_DEPENDS.xorg-libs+=		xorg-libs>=6.9.0
+BUILDLINK_ABI_DEPENDS.xorg-libs?=	xorg-libs>=6.9.0nb2
 BUILDLINK_PKGSRCDIR.xorg-libs?=		../../x11/xorg-libs
 BUILDLINK_LIBDIRS.xorg-libs?=		${X11ROOT_PREFIX}/lib
 BUILDLINK_TRANSFORM.xorg-libs+=		-e "s|/${X11ROOT_PREFIX}/|/|"
Index: ./x11/xorg-libs/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xorg-libs/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- ./x11/xorg-libs/builtin.mk	16 Oct 2005 19:53:36 -0000	1.3
+++ ./x11/xorg-libs/builtin.mk	4 Apr 2006 06:26:59 -0000
@@ -43,7 +43,7 @@
 .    if defined(BUILTIN_PKG.xorg-libs) && \
         !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS])
 USE_BUILTIN.xorg-libs=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.xorg-libs}
 .        if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS])
 USE_BUILTIN.xorg-libs!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \
Index: ./x11/xosd/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xosd/buildlink3.mk,v
retrieving revision 1.5
diff -u -r1.5 buildlink3.mk
--- ./x11/xosd/buildlink3.mk	5 Feb 2006 23:11:48 -0000	1.5
+++ ./x11/xosd/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xosd
 
 .if !empty(XOSD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xosd+=	xosd>=2.2.12
-BUILDLINK_RECOMMENDED.xosd+=	xosd>=2.2.12nb2
+BUILDLINK_API_DEPENDS.xosd+=	xosd>=2.2.12
+BUILDLINK_ABI_DEPENDS.xosd+=	xosd>=2.2.12nb2
 BUILDLINK_PKGSRCDIR.xosd?=	../../x11/xosd
 .endif	# XOSD_BUILDLINK3_MK
 
Index: ./x11/xscreensaver/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver/Makefile.common,v
retrieving revision 1.85
diff -u -r1.85 Makefile.common
--- ./x11/xscreensaver/Makefile.common	5 Dec 2005 20:51:20 -0000	1.85
+++ ./x11/xscreensaver/Makefile.common	4 Apr 2006 06:26:59 -0000
@@ -10,7 +10,7 @@
 HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 BUILD_USES_MSGFMT=	yes
-BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.2
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0.2
 
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
Index: ./x11/xscreensaver/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xscreensaver/buildlink3.mk,v
retrieving revision 1.4
diff -u -r1.4 buildlink3.mk
--- ./x11/xscreensaver/buildlink3.mk	5 Feb 2006 23:11:49 -0000	1.4
+++ ./x11/xscreensaver/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xscreensaver
 
 .if !empty(XSCREENSAVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xscreensaver+=	xscreensaver>=4.14
-BUILDLINK_RECOMMENDED.xscreensaver?=	xscreensaver>=4.22nb3
+BUILDLINK_API_DEPENDS.xscreensaver+=	xscreensaver>=4.14
+BUILDLINK_ABI_DEPENDS.xscreensaver?=	xscreensaver>=4.22nb3
 BUILDLINK_PKGSRCDIR.xscreensaver?=	../../x11/xscreensaver
 .endif	# XSCREENSAVER_BUILDLINK3_MK
 
Index: ./x11/xview-lib/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xview-lib/buildlink3.mk,v
retrieving revision 1.2
diff -u -r1.2 buildlink3.mk
--- ./x11/xview-lib/buildlink3.mk	5 Feb 2006 23:11:50 -0000	1.2
+++ ./x11/xview-lib/buildlink3.mk	4 Apr 2006 06:26:59 -0000
@@ -11,8 +11,8 @@
 BUILDLINK_PACKAGES+=	xview-lib
 
 .if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xview-lib+=	xview-lib>=3.2.1
-BUILDLINK_RECOMMENDED.xview-lib?=	xview-lib>=3.2.1nb6
+BUILDLINK_API_DEPENDS.xview-lib+=	xview-lib>=3.2.1
+BUILDLINK_ABI_DEPENDS.xview-lib?=	xview-lib>=3.2.1nb6
 BUILDLINK_PKGSRCDIR.xview-lib?=	../../x11/xview-lib
 .endif	# XVIEW_LIB_BUILDLINK3_MK
 
Index: ./x11/zenity/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/zenity/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- ./x11/zenity/Makefile	21 Mar 2006 06:00:54 -0000	1.30
+++ ./x11/zenity/Makefile	4 Apr 2006 06:26:59 -0000
@@ -18,7 +18,7 @@
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.8.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: mk/apache.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/apache.mk,v
retrieving revision 1.9
diff -u -r1.9 apache.mk
--- mk/apache.mk	21 Apr 2005 23:05:41 -0000	1.9
+++ mk/apache.mk	4 Apr 2006 06:26:59 -0000
@@ -108,8 +108,8 @@
 _PKG_APACHE=		"none"
 .endif
 
-BUILDLINK_DEPENDS.apache13?=	apache-1.3*
-BUILDLINK_DEPENDS.apache2?=	apache-2*
+BUILDLINK_API_DEPENDS.apache13?=	apache-1.3*
+BUILDLINK_API_DEPENDS.apache2?=	apache-2*
 
 .if ${_PKG_APACHE} == "apache13"
 _APACHE_PKGSRCDIR=	../../www/apache
Index: mk/bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1812
diff -u -r1.1812 bsd.pkg.mk
--- mk/bsd.pkg.mk	20 Mar 2006 01:48:57 -0000	1.1812
+++ mk/bsd.pkg.mk	4 Apr 2006 06:27:00 -0000
@@ -760,11 +760,11 @@
 
 .include "../../mk/wrapper/bsd.wrapper.mk"
 
-.if defined(RECOMMENDED)
-.  if !empty(IGNORE_RECOMMENDED:M[nN][oO])
-DEPENDS+=		${RECOMMENDED}
+.if defined(ABI_DEPENDS)
+.  if !empty(USE_ABI_DEPENDS:M[yY][eE][sS])
+DEPENDS+=		${ABI_DEPENDS}
 .  else
-BUILD_DEFS+=		IGNORE_RECOMMENDED
+BUILD_DEFS+=		USE_ABI_DEPENDS
 .  endif
 .endif
 
@@ -1806,8 +1806,8 @@
 	@${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be made available through FTP:"
 	@${ECHO_MSG} "${_PKGSRC_IN}>         " ${NO_BIN_ON_FTP:Q}
 .  endif
-.  if defined(RECOMMENDED) && !empty(IGNORE_RECOMMENDED:M[yY][eE][sS])
-	@${ECHO_MSG} "${_PKGSRC_IN}> Warning: dependency recommendations are being ignored!"
+.  if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo])
+	@${ECHO_MSG} "${_PKGSRC_IN}> Warning: ABI dependency recommendations are being ignored!"
 	@${ECHO_MSG} "${_PKGSRC_IN}>          ${PKGNAME} should not be uploaded nor"
 	@${ECHO_MSG} "${_PKGSRC_IN}>          otherwise be used as a binary package!"
 .  endif
Index: mk/db1.builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/db1.builtin.mk,v
retrieving revision 1.14
diff -u -r1.14 db1.builtin.mk
--- mk/db1.builtin.mk	11 Aug 2005 20:25:20 -0000	1.14
+++ mk/db1.builtin.mk	4 Apr 2006 06:27:00 -0000
@@ -41,7 +41,7 @@
 USE_BUILTIN.db1=	${IS_BUILTIN.db1}
 .    if defined(BUILTIN_PKG.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS])
 USE_BUILTIN.db1=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.db1}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.db1}
 .        if !empty(USE_BUILTIN.db1:M[yY][eE][sS])
 USE_BUILTIN.db1!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.db1:Q}; then	\
Index: mk/java-vm.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/java-vm.mk,v
retrieving revision 1.44
diff -u -r1.44 java-vm.mk
--- mk/java-vm.mk	12 Dec 2005 14:43:26 -0000	1.44
+++ mk/java-vm.mk	4 Apr 2006 06:27:00 -0000
@@ -199,18 +199,18 @@
 _PKG_JVM=		"none"
 .endif
 
-BUILDLINK_DEPENDS.blackdown-jdk13?=	blackdown-jdk13-[0-9]*
-BUILDLINK_DEPENDS.blackdown-jre13?=	blackdown-jre13-[0-9]*
-BUILDLINK_DEPENDS.jdk?=			jdk-[0-9]*
-BUILDLINK_DEPENDS.jdk14?=		jdk14-[0-9]*
-BUILDLINK_DEPENDS.kaffe?=		kaffe>=1.1.4
-BUILDLINK_DEPENDS.sun-jdk13?=		sun-jdk13-[0-9]*
-BUILDLINK_DEPENDS.sun-jre13?=		sun-jre13-[0-9]*
-BUILDLINK_DEPENDS.sun-jdk14?=		sun-jdk14-[0-9]*
-BUILDLINK_DEPENDS.sun-jre14?=		sun-jre14-[0-9]*
-BUILDLINK_DEPENDS.sun-jdk15?=		sun-jdk15-[0-9]*
-BUILDLINK_DEPENDS.sun-jre15?=		sun-jre15-[0-9]*
-#BUILDLINK_DEPENDS.win32-jdk?=		win32-jdk>=0.1
+BUILDLINK_API_DEPENDS.blackdown-jdk13?=	blackdown-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.blackdown-jre13?=	blackdown-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.jdk?=			jdk-[0-9]*
+BUILDLINK_API_DEPENDS.jdk14?=		jdk14-[0-9]*
+BUILDLINK_API_DEPENDS.kaffe?=		kaffe>=1.1.4
+BUILDLINK_API_DEPENDS.sun-jdk13?=		sun-jdk13-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre13?=		sun-jre13-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk14?=		sun-jdk14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre14?=		sun-jre14-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jdk15?=		sun-jdk15-[0-9]*
+BUILDLINK_API_DEPENDS.sun-jre15?=		sun-jre15-[0-9]*
+#BUILDLINK_API_DEPENDS.win32-jdk?=		win32-jdk>=0.1
 
 _JRE.blackdown-jdk13=	blackdown-jre13
 _JRE.jdk=		jdk
Index: mk/oss.builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/oss.builtin.mk,v
retrieving revision 1.1
diff -u -r1.1 oss.builtin.mk
--- mk/oss.builtin.mk	9 Mar 2006 20:23:13 -0000	1.1
+++ mk/oss.builtin.mk	4 Apr 2006 06:27:00 -0000
@@ -37,7 +37,7 @@
 .    if defined(BUILTIN_PKG.oss) && \
         !empty(IS_BUILTIN.oss:M[yY][eE][sS])
 USE_BUILTIN.oss=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.oss}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.oss}
 .        if !empty(USE_BUILTIN.oss:M[yY][eE][sS])
 USE_BUILTIN.oss!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.oss:Q}; then	\
Index: mk/pthread.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/pthread.buildlink3.mk,v
retrieving revision 1.21
diff -u -r1.21 pthread.buildlink3.mk
--- mk/pthread.buildlink3.mk	4 Nov 2005 14:36:23 -0000	1.21
+++ mk/pthread.buildlink3.mk	4 Apr 2006 06:27:00 -0000
@@ -116,7 +116,7 @@
 .elif ${PTHREAD_TYPE} == "${_PKG_PTHREAD}"
 .  if exists(${_PKG_PTHREAD_BUILDLINK3_MK})
 .    if !empty(_PKG_PTHREAD_DEPENDS)
-BUILDLINK_DEPENDS.${_PKG_PTHREAD}+=	${_PKG_PTHREAD_DEPENDS}
+BUILDLINK_API_DEPENDS.${_PKG_PTHREAD}+=	${_PKG_PTHREAD_DEPENDS}
 .    endif
 .    include "${_PKG_PTHREAD_BUILDLINK3_MK}"
 BUILDLINK_PREFIX.pthread=		${BUILDLINK_PREFIX.${_PKG_PTHREAD}}
Index: mk/solaris-pam.builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/solaris-pam.builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 solaris-pam.builtin.mk
--- mk/solaris-pam.builtin.mk	1 Jun 2005 18:03:06 -0000	1.3
+++ mk/solaris-pam.builtin.mk	4 Apr 2006 06:27:00 -0000
@@ -32,7 +32,7 @@
 .    if defined(BUILTIN_PKG.solaris-pam) && \
         !empty(IS_BUILTIN.solaris-pam:M[yY][eE][sS])
 USE_BUILTIN.solaris-pam=	yes
-.      for _dep_ in ${BUILDLINK_DEPENDS.solaris-pam}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.solaris-pam}
 .        if !empty(USE_BUILTIN.solaris-pam:M[yY][eE][sS])
 USE_BUILTIN.solaris-pam!=						\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.solaris-pam:Q}; then \
Index: mk/tex.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tex.buildlink3.mk,v
retrieving revision 1.12
diff -u -r1.12 tex.buildlink3.mk
--- mk/tex.buildlink3.mk	27 Feb 2006 12:14:50 -0000	1.12
+++ mk/tex.buildlink3.mk	4 Apr 2006 06:27:00 -0000
@@ -88,11 +88,11 @@
 
 # set up variables for buildlink or depends
 #
-BUILDLINK_DEPENDS.teTeX1=	teTeX-bin-1.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX1=	teTeX-bin-1.[0-9]*
 BUILDLINK_PKGSRCDIR.teTeX1=	../../print/teTeX1-bin
-BUILDLINK_DEPENDS.teTeX2=	teTeX-bin-2.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX2=	teTeX-bin-2.[0-9]*
 BUILDLINK_PKGSRCDIR.teTeX2=	../../print/teTeX-bin
-BUILDLINK_DEPENDS.teTeX3=	teTeX-bin-3.[0-9]*
+BUILDLINK_API_DEPENDS.teTeX3=	teTeX-bin-3.[0-9]*
 BUILDLINK_PKGSRCDIR.teTeX3=	../../print/teTeX3-bin
 
 # Determine the TeX version to be used.
@@ -110,13 +110,13 @@
 # Set version specifics.
 #
 .if ${TEX_TYPE} == "teTeX3"
-_TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX3}
+_TEX_DEPENDENCY=	${BUILDLINK_API_DEPENDS.teTeX3}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX3}
 .elif ${TEX_TYPE} == "teTeX2"
-_TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX2}
+_TEX_DEPENDENCY=	${BUILDLINK_API_DEPENDS.teTeX2}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX2}
 .elif ${TEX_TYPE} == "teTeX1"
-_TEX_DEPENDENCY=	${BUILDLINK_DEPENDS.teTeX1}
+_TEX_DEPENDENCY=	${BUILDLINK_API_DEPENDS.teTeX1}
 _TEX_PKGSRCDIR=	${BUILDLINK_PKGSRCDIR.teTeX1}
 .endif
 
Index: mk/buildlink3/bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.172
diff -u -r1.172 bsd.buildlink3.mk
--- mk/buildlink3/bsd.buildlink3.mk	9 Dec 2005 16:16:41 -0000	1.172
+++ mk/buildlink3/bsd.buildlink3.mk	4 Apr 2006 06:27:01 -0000
@@ -48,8 +48,8 @@
 # BUILDLINK_PACKAGES+=	foo
 #
 # .if !empty(FOO_BUILDLINK3_MK:M+)
-# BUILDLINK_DEPENDS.foo+=	foo-lib>=1.0
-# BUILDLINK_RECOMMENDED.foo?=	foo-lib>=1.0nb1
+# BUILDLINK_API_DEPENDS.foo+=	foo-lib>=1.0
+# BUILDLINK_ABI_DEPENDS.foo?=	foo-lib>=1.0nb1
 # BUILDLINK_PKGSRCDIR.foo?=	../../category/foo-lib
 #
 # # We want "-lbar" to eventually resolve to "-lfoo".
@@ -184,33 +184,33 @@
 #
 _BLNK_ADD_TO.DEPENDS=		# empty
 _BLNK_ADD_TO.BUILD_DEPENDS=	# empty
-_BLNK_ADD_TO.RECOMMENDED=	# empty
+_BLNK_ADD_TO.ABI_DEPENDS=	# empty
 .for _pkg_ in ${_BLNK_DEPENDS_LIST}
 .  if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
 _BLNK_DEPMETHOD.${_pkg_}=	_BLNK_ADD_TO.DEPENDS
-_BLNK_RECMETHOD.${_pkg_}=	_BLNK_ADD_TO.RECOMMENDED
+_BLNK_ABIMETHOD.${_pkg_}=	_BLNK_ADD_TO.ABI_DEPENDS
 .  elif !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mbuild)
 _BLNK_DEPMETHOD.${_pkg_}=	_BLNK_ADD_TO.BUILD_DEPENDS
-_BLNK_RECMETHOD.${_pkg_}=	_BLNK_ADD_TO.BUILD_DEPENDS
+_BLNK_ABIMETHOD.${_pkg_}=	_BLNK_ADD_TO.BUILD_DEPENDS
 .  endif
-.  if defined(BUILDLINK_DEPENDS.${_pkg_}) && \
+.  if defined(BUILDLINK_API_DEPENDS.${_pkg_}) && \
       defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-.    for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+.    for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
 .      if empty(${_BLNK_DEPMETHOD.${_pkg_}}:M${_depend_}\:*)
 ${_BLNK_DEPMETHOD.${_pkg_}}+=	${_depend_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
 .      endif
 .    endfor
 .  endif
-.  if defined(BUILDLINK_RECOMMENDED.${_pkg_}) && \
+.  if defined(BUILDLINK_ABI_DEPENDS.${_pkg_}) && \
       defined(BUILDLINK_PKGSRCDIR.${_pkg_})
-.    for _rec_ in ${BUILDLINK_RECOMMENDED.${_pkg_}}
-.      if empty(${_BLNK_RECMETHOD.${_pkg_}}:M${_rec_}\:*)
-${_BLNK_RECMETHOD.${_pkg_}}+=	${_rec_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
+.    for _abi_ in ${BUILDLINK_ABI_DEPENDS.${_pkg_}}
+.      if empty(${_BLNK_ABIMETHOD.${_pkg_}}:M${_abi_}\:*)
+${_BLNK_ABIMETHOD.${_pkg_}}+=	${_abi_}:${BUILDLINK_PKGSRCDIR.${_pkg_}}
 .      endif
 .    endfor
 .  endif
 .endfor
-.for _depmethod_ in DEPENDS BUILD_DEPENDS RECOMMENDED
+.for _depmethod_ in DEPENDS BUILD_DEPENDS ABI_DEPENDS
 .  if !empty(_BLNK_ADD_TO.${_depmethod_})
 ${_depmethod_}+=	${_BLNK_ADD_TO.${_depmethod_}}
 .  endif
@@ -280,7 +280,7 @@
 #
 .  if !defined(_BLNK_PKG_DBDIR.${_pkg_})
 _BLNK_PKG_DBDIR.${_pkg_}?=	# empty
-.    for _depend_ in ${BUILDLINK_DEPENDS.${_pkg_}}
+.    for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
 .      if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
 _BLNK_PKG_DBDIR.${_pkg_}!=	\
 	dir="";								\
Index: mk/buildlink3/bsd.builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.builtin.mk,v
retrieving revision 1.6
diff -u -r1.6 bsd.builtin.mk
--- mk/buildlink3/bsd.builtin.mk	20 Jun 2005 05:44:17 -0000	1.6
+++ mk/buildlink3/bsd.builtin.mk	4 Apr 2006 06:27:01 -0000
@@ -85,7 +85,7 @@
 # .    if defined(BUILTIN_PKG.wibble) && \
 #         !empty(IS_BUILTIN.wibble:M[yY][eE][sS])
 # USE_BUILTIN.wibble=	yes
-# .      for _dep_ in ${BUILDLINK_DEPENDS.wibble}
+# .      for _dep_ in ${BUILDLINK_API_DEPENDS.wibble}
 # .        if !empty(USE_BUILTIN.wibble:M[yY][eE][sS])
 # USE_BUILTIN.wibble!=							\
 #	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.wibble:Q}; then	\
Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.114
diff -u -r1.114 mk.conf
--- mk/defaults/mk.conf	30 Mar 2006 04:57:45 -0000	1.114
+++ mk/defaults/mk.conf	4 Apr 2006 06:27:01 -0000
@@ -100,17 +100,17 @@
 # Possible: defined, not defined
 # Default: not defined
 
-IGNORE_RECOMMENDED?=	no
-# Ignore package prerequisite recommendations.  If this is set to
-# "no", all entries in RECOMMENDED will be added to DEPENDS.
-# If set to "yes", a warning will be printed if recommendations
+USE_ABI_DEPENDS?=	yes
+# Honor package prerequisite ABI recommendations.  If this is set
+# to "yes", all entries in ABI_DEPENDS will be added to DEPENDS.
+# If set to "no", a warning will be printed if recommendations
 # are possibly ignored.
 #
 # WARNING: This should only be set if you know what you're doing.
 # Please read pkgsrc/doc/pkgsrc.txt for details.
 #
 # Possible: yes, no
-# Default: no
+# Default: yes
 
 #PKG_REGISTER_SHELLS= YES
 # Automatically register shells in /etc/shells
Index: mk/tools/replace.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/replace.mk,v
retrieving revision 1.163
diff -u -r1.163 replace.mk
--- mk/tools/replace.mk	19 Mar 2006 23:40:07 -0000	1.163
+++ mk/tools/replace.mk	4 Apr 2006 06:27:01 -0000
@@ -322,7 +322,7 @@
 .  elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
 .    include "../../devel/flex/buildlink3.mk"
 _TOOLS_DEPENDS.flex=		# empty
-.      for _dep_ in ${BUILDLINK_DEPENDS.flex}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
 _TOOLS_DEPENDS.flex+=		${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
 .      endfor
 TOOLS_DEPENDS.flex?=		${_TOOLS_DEPENDS.flex}
@@ -459,7 +459,7 @@
 .  elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS])
 .    include "../../devel/flex/buildlink3.mk"
 _TOOLS_DEPENDS.lex=		# empty
-.      for _dep_ in ${BUILDLINK_DEPENDS.flex}
+.      for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
 _TOOLS_DEPENDS.lex+=		${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
 .      endfor
 TOOLS_DEPENDS.lex?=		${_TOOLS_DEPENDS.lex}
