Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
author: reed <reed> 2006-04-06 06:21:32 +0000
committer: reed <reed> 2006-04-06 06:21:32 +0000
commit: 7091841754a8a638d0a670a1c736986077d4d43c (patch)
tree: b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /lang
parent: d42a5d51fa206e34bd9b954c36d21398c8b846cb (diff)
download: pkgsrc-7091841754a8a638d0a670a1c736986077d4d43c.tar.gz
68 files changed, 194 insertions, 194 deletions
diff --git a/lang/Cg-compiler/buildlink3.mk b/lang/Cg-compiler/buildlink3.mk
index 52e2cc55db4..02d98a34218 100644
--- a/lang/Cg-compiler/buildlink3.mk
+++ b/lang/Cg-compiler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:09 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CG_COMPILER_BUILDLINK3_MK:=	${CG_COMPILER_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NCg-compiler}
 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
 
diff --git a/lang/blackdown-jdk13/buildlink3.mk b/lang/blackdown-jdk13/buildlink3.mk
index ddbbe02064f..027afd86d4f 100644
--- a/lang/blackdown-jdk13/buildlink3.mk
+++ b/lang/blackdown-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:09 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKDOWN_JDK13_BUILDLINK3_MK:=	${BLACKDOWN_JDK13_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	blackdown-jdk13
 
 .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
 
diff --git a/lang/blackdown-jre13/buildlink3.mk b/lang/blackdown-jre13/buildlink3.mk
index c82dd6940cb..e58a2f49625 100644
--- a/lang/blackdown-jre13/buildlink3.mk
+++ b/lang/blackdown-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 18:12:11 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:09 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKDOWN_JRE13_BUILDLINK3_MK:=	${BLACKDOWN_JRE13_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	blackdown-jre13
 
 .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=	\
diff --git a/lang/cdl3/buildlink3.mk b/lang/cdl3/buildlink3.mk
index 63845220449..53a0bc4791d 100644
--- a/lang/cdl3/buildlink3.mk
+++ b/lang/cdl3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CDL3_BUILDLINK3_MK:=	${CDL3_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncdl3}
 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
 
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 4953134d110..79af5378a5b 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/04 19:12:10 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/04/06 06:22:10 reed Exp $
 
 DISTNAME=	clisp-2.38
 CATEGORIES=	lang
@@ -54,7 +54,7 @@ pre-build:
 .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"
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 82af9fef51f..89b17e780ab 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/06 06:22:10 reed Exp $
 #
 
 DISTNAME=	coq-8.0pl3
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	-emacslib ${PREFIX}/share/emacs/site-lisp
 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"
 
diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk
index c8a525eba21..b4ac6b346b0 100644
--- a/lang/elk/buildlink3.mk
+++ b/lang/elk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/15 23:07:21 tonio Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ELK_BUILDLINK3_MK:=	${ELK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nelk}
 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
 
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index 6c07d38f16f..ce6286796e3 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:10 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 ERLANG_BUILDLINK3_MK:=		${ERLANG_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Nerlang}
 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
 
diff --git a/lang/ezm3/buildlink3.mk b/lang/ezm3/buildlink3.mk
index cdb5069cc40..f84aa223afc 100644
--- a/lang/ezm3/buildlink3.mk
+++ b/lang/ezm3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:10 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EZM3_BUILDLINK3_MK:=	${EZM3_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nezm3}
 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
 
diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk
index ba5bc297250..156b3749a68 100644
--- a/lang/f2c/buildlink3.mk
+++ b/lang/f2c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:10 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 F2C_BUILDLINK3_MK:=	${F2C_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nf2c}
 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
 
diff --git a/lang/gauche/buildlink3.mk b/lang/gauche/buildlink3.mk
index d4771529eee..914c5b85a0b 100644
--- a/lang/gauche/buildlink3.mk
+++ b/lang/gauche/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/09 15:38:54 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAUCHE_BUILDLINK3_MK:=	${GAUCHE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGauche}
 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
 
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 4aab75d285b..8b71c3e2be0 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/30 03:44:43 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/04/06 06:22:11 reed Exp $
 #
 
 DISTNAME=	gawk-3.1.5
@@ -35,7 +35,7 @@ PKG_SUPPORTED_OPTIONS=	portals
 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"
diff --git a/lang/gcc/buildlink3.mk b/lang/gcc/buildlink3.mk
index 546400f1a95..5a4a91af20e 100644
--- a/lang/gcc/buildlink3.mk
+++ b/lang/gcc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC_BUILDLINK3_MK:=	${GCC_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc}
 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 \
diff --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk
index 6e886ee3c86..2a819cb336c 100644
--- a/lang/gcc3-ada/buildlink3.mk
+++ b/lang/gcc3-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC3_ADA_BUILDLINK3_MK:=  ${GCC3_ADA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc3-ada}
 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`
diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk
index 98adf205c93..27897e9944e 100644
--- a/lang/gcc3-c++/buildlink3.mk
+++ b/lang/gcc3-c++/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_CXX_BUILDLINK3_MK:=	${GCC3_CXX_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+=	gcc3-cxx
 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}\///}
diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk
index 95f7b362824..8f6fab23492 100644
--- a/lang/gcc3-c/buildlink3.mk
+++ b/lang/gcc3-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCC3_C_BUILDLINK3_MK:=	${GCC3_C_BUILDLINK3_MK}+
@@ -22,8 +22,8 @@ BUILDLINK_PACKAGES+=	gcc3-c
 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)
diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk
index 2e7d4579073..3e3bc200a08 100644
--- a/lang/gcc3-f77/buildlink3.mk
+++ b/lang/gcc3-f77/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_F77_BUILDLINK3_MK:=	${GCC3_F77_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+=	gcc3-f77
 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}\///}
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index f32878979c3..0c34c28972a 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/06 06:22:11 reed Exp $
 
 PKGNAME=	gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
 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
diff --git a/lang/gcc3-java/buildlink3.mk b/lang/gcc3-java/buildlink3.mk
index bccc0ba309b..6f253bb4d09 100644
--- a/lang/gcc3-java/buildlink3.mk
+++ b/lang/gcc3-java/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_JAVA_BUILDLINK3_MK:=	${GCC3_JAVA_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+=	gcc3-java
 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}\///}
diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk
index a9bfa237fd0..1abf123c3e0 100644
--- a/lang/gcc3-objc/buildlink3.mk
+++ b/lang/gcc3-objc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GCC3_OBJC_BUILDLINK3_MK:=	${GCC3_OBJC_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PACKAGES+=	gcc3-objc
 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}\///}
diff --git a/lang/gcc3/language.mk b/lang/gcc3/language.mk
index 896c1ab653a..201f5dfb8e6 100644
--- a/lang/gcc3/language.mk
+++ b/lang/gcc3/language.mk
@@ -1,6 +1,6 @@
-# $NetBSD: language.mk,v 1.4 2004/09/22 08:09:39 jlam Exp $
+# $NetBSD: language.mk,v 1.5 2006/04/06 06:22:11 reed 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"
diff --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk
index f21f7acbb45..44da5cde190 100644
--- a/lang/gcc34-ada/buildlink3.mk
+++ b/lang/gcc34-ada/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCCADA_BUILDLINK3_MK:=	${GCCADA_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngcc34-ada}
 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)
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk
index c833cf8d468..6cea81bdec7 100644
--- a/lang/gcc34/buildlink3.mk
+++ b/lang/gcc34/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES:=    ${BUILDLINK_PACKAGES:Ngcc34}
 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
diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk
index d97a2abeca9..ae339f18ac9 100644
--- a/lang/ghc/buildlink3.mk
+++ b/lang/ghc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/03/22 15:12:07 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:11 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GHC_BUILDLINK3_MK:=	${GHC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nghc}
 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
diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk
index a6bde287b5d..7fa67842ed5 100644
--- a/lang/guile/buildlink3.mk
+++ b/lang/guile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE_BUILDLINK3_MK:=	${GUILE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile}
 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
 
diff --git a/lang/guile14/buildlink3.mk b/lang/guile14/buildlink3.mk
index f5cfaabacbe..652e29c71db 100644
--- a/lang/guile14/buildlink3.mk
+++ b/lang/guile14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GUILE14_BUILDLINK3_MK:=	${GUILE14_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguile14}
 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
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 6ead112d630..12b492641c5 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JDK_BUILDLINK3_MK:=	${JDK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Njdk}
 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
 
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 60783505152..794aa6f8658 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
 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
diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk
index e4457c0f0b8..0cb2067d1c8 100644
--- a/lang/librep/buildlink3.mk
+++ b/lang/librep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBREP_BUILDLINK3_MK:=	${LIBREP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibrep}
 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
diff --git a/lang/libtcl-nothread/buildlink3.mk b/lang/libtcl-nothread/buildlink3.mk
index 552083abe5d..12cb06249f8 100644
--- a/lang/libtcl-nothread/buildlink3.mk
+++ b/lang/libtcl-nothread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCLNT_BUILDLINK3_MK:=	${TCLNT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntclnt}
 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*
diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk
index 62eba55f0d5..ad4a8d96f0f 100644
--- a/lang/lua/buildlink3.mk
+++ b/lang/lua/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/09/04 04:59:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LUA_BUILDLINK3_MK:=	${LUA_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua}
 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
 
diff --git a/lang/lua4/buildlink3.mk b/lang/lua4/buildlink3.mk
index bc2030aee56..0e65cf0afd7 100644
--- a/lang/lua4/buildlink3.mk
+++ b/lang/lua4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/28 00:28:18 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LUA4_BUILDLINK3_MK:=	${LUA4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlua4}
 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
 
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index b8739e1fdf6..80c80f62662 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nmono}
 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
 
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index c626d553d42..bba1a9f8739 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/02/05 23:09:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=		ocaml
 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"
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 61d97cfe8ba..33bd18c95cb 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:55 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/06 06:22:12 reed Exp $
 
 DISTNAME=	onyx-${VERS}
 PKGREVISION=	2
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]*-*
 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}
diff --git a/lang/parrot/buildlink3.mk b/lang/parrot/buildlink3.mk
index 21ef0036545..190dd82fb60 100644
--- a/lang/parrot/buildlink3.mk
+++ b/lang/parrot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:12 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARROT_BUILDLINK3_MK:=	${PARROT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nparrot}
 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
 
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index f6228f56598..3a2a245aaa8 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_PACKAGES+=	perl
 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
diff --git a/lang/php5/buildlink3.mk b/lang/php5/buildlink3.mk
index acf967b2126..11e0c686177 100644
--- a/lang/php5/buildlink3.mk
+++ b/lang/php5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/17 09:48:01 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nphp}
 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
 
diff --git a/lang/pnet/buildlink3.mk b/lang/pnet/buildlink3.mk
index ef59323e306..c255268f0bc 100644
--- a/lang/pnet/buildlink3.mk
+++ b/lang/pnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNET_BUILDLINK3_MK:=	${PNET_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnet}
 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
 
diff --git a/lang/pnetC/buildlink3.mk b/lang/pnetC/buildlink3.mk
index 6d6f3658604..0ab8b697d7f 100644
--- a/lang/pnetC/buildlink3.mk
+++ b/lang/pnetC/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETC_BUILDLINK3_MK:=	${PNETC_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NpnetC}
 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
 
diff --git a/lang/pnetlib/buildlink3.mk b/lang/pnetlib/buildlink3.mk
index dcf9ae27949..8f254677619 100644
--- a/lang/pnetlib/buildlink3.mk
+++ b/lang/pnetlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNETLIB_BUILDLINK3_MK:=	${PNETLIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npnetlib}
 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
 
diff --git a/lang/py-extclass/buildlink3.mk b/lang/py-extclass/buildlink3.mk
index bbf58d5d92d..b6c64479356 100644
--- a/lang/py-extclass/buildlink3.mk
+++ b/lang/py-extclass/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/09/19 14:56:26 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYEXTCLASS_BUILDLINK3_MK:=	${PYEXTCLASS_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyextclass}
 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
 
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index a54453b8c4d..0d9cddedafb 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.38 2005/11/04 18:24:37 rillig Exp $
+# $NetBSD: pyversion.mk,v 1.39 2006/04/06 06:22:13 reed Exp $
 
 .if !defined(PYTHON_PYVERSION_MK)
 PYTHON_PYVERSION_MK=	defined
@@ -12,12 +12,12 @@ PYTHON_VERSIONS_INCOMPATIBLE+=		22 21 20 15
 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 @@ _PYTHON_VERSION=	${_PYTHON_VERSION_FIRSTACCEPTED}
 #
 .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)
diff --git a/lang/python15/buildlink3.mk b/lang/python15/buildlink3.mk
index c7b49fddf79..53dce08e7ed 100644
--- a/lang/python15/buildlink3.mk
+++ b/lang/python15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:36 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON15_BUILDLINK3_MK:=	${PYTHON15_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython15}
 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)
diff --git a/lang/python20/buildlink3.mk b/lang/python20/buildlink3.mk
index a75394c6d0b..0cc38ff1527 100644
--- a/lang/python20/buildlink3.mk
+++ b/lang/python20/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/03/26 02:27:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:13 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON20_BUILDLINK3_MK:=	${PYTHON20_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython20}
 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)
diff --git a/lang/python21/buildlink3.mk b/lang/python21/buildlink3.mk
index f8b7e5b0fd9..f3719180f4c 100644
--- a/lang/python21/buildlink3.mk
+++ b/lang/python21/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/11/14 22:53:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON21_BUILDLINK3_MK:=	${PYTHON21_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython21}
 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)
diff --git a/lang/python22/buildlink3.mk b/lang/python22/buildlink3.mk
index 6757fdf5bcb..81c383a0859 100644
--- a/lang/python22/buildlink3.mk
+++ b/lang/python22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/11/14 22:53:09 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON22_BUILDLINK3_MK:=	${PYTHON22_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython22}
 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)
diff --git a/lang/python23-nth/buildlink3.mk b/lang/python23-nth/buildlink3.mk
index 532a088e171..93008efef0b 100644
--- a/lang/python23-nth/buildlink3.mk
+++ b/lang/python23-nth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_NTH_BUILDLINK3_MK:=	${PYTHON23_NTH_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23-nth}
 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)
diff --git a/lang/python23/buildlink3.mk b/lang/python23/buildlink3.mk
index 6572e618b40..f29e916b50b 100644
--- a/lang/python23/buildlink3.mk
+++ b/lang/python23/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON23_BUILDLINK3_MK:=	${PYTHON23_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython23}
 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)
diff --git a/lang/python24/buildlink3.mk b/lang/python24/buildlink3.mk
index 9b8ebf8d40c..74f2d86d934 100644
--- a/lang/python24/buildlink3.mk
+++ b/lang/python24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYTHON24_BUILDLINK3_MK:=	${PYTHON24_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npython24}
 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)
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index 00ad4911743..bcf595f33b3 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/11/02 07:44:02 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RUBY_BUILDLINK3_MK:=	${RUBY_BUILDLINK3_MK}+
@@ -16,8 +16,8 @@ BUILDLINK_PACKAGES+=	${RUBY_BASE}
 
 .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
diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk
index 7c376d7d0d0..ffb6a60740f 100644
--- a/lang/spidermonkey/buildlink3.mk
+++ b/lang/spidermonkey/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:51 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SPIDERMONKEY_BUILDLINK3_MK:=	${SPIDERMONKEY_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nspidermonkey}
 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
 
diff --git a/lang/sun-jdk13/buildlink3.mk b/lang/sun-jdk13/buildlink3.mk
index 56091032477..a560217be4f 100644
--- a/lang/sun-jdk13/buildlink3.mk
+++ b/lang/sun-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK13_BUILDLINK3_MK:=	${SUN_JDK13_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	sun-jdk13
 
 .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
 
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
index bf9c565ceb7..0ae29465686 100644
--- a/lang/sun-jdk14/buildlink3.mk
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/03/07 04:39:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK14_BUILDLINK3_MK:=	${SUN_JDK14_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	sun-jdk14
 
 .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
 
diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk
index 01a3ec24678..894566401e1 100644
--- a/lang/sun-jdk15/buildlink3.mk
+++ b/lang/sun-jdk15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK15_BUILDLINK3_MK:=	${SUN_JDK15_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	sun-jdk15
 
 .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
 
diff --git a/lang/sun-jre13/buildlink3.mk b/lang/sun-jre13/buildlink3.mk
index 558b3fc8ae0..5aef74cb7b4 100644
--- a/lang/sun-jre13/buildlink3.mk
+++ b/lang/sun-jre13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE13_BUILDLINK3_MK:=	${SUN_JRE13_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre13}
 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
diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk
index 5990ff5c582..b89412bd8c7 100644
--- a/lang/sun-jre14/buildlink3.mk
+++ b/lang/sun-jre14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/03/07 04:36:21 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:14 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE14_BUILDLINK3_MK:=	${SUN_JRE14_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre14}
 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
diff --git a/lang/sun-jre15/buildlink3.mk b/lang/sun-jre15/buildlink3.mk
index 38e3c2085f3..985b0d2a799 100644
--- a/lang/sun-jre15/buildlink3.mk
+++ b/lang/sun-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JRE15_BUILDLINK3_MK:=	${SUN_JRE15_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre15}
 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
diff --git a/lang/swi-prolog-lite/buildlink3.mk b/lang/swi-prolog-lite/buildlink3.mk
index 1f782aac9f4..eac715679ac 100644
--- a/lang/swi-prolog-lite/buildlink3.mk
+++ b/lang/swi-prolog-lite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/05/20 11:09:17 hubertf Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SWI_PROLOG_LITE_BUILDLINK3_MK:=	${SWI_PROLOG_LITE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswi-prolog-lite}
 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
 
diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk
index b942e5c86f6..199efdf24c9 100644
--- a/lang/tcl-expect/buildlink3.mk
+++ b/lang/tcl-expect/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:15:03 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_EXPECT_BUILDLINK3_MK:=	${TCL_EXPECT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-expect}
 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
 
diff --git a/lang/tcl-itcl-current/buildlink3.mk b/lang/tcl-itcl-current/buildlink3.mk
index 2841ad8ed2c..63402029b87 100644
--- a/lang/tcl-itcl-current/buildlink3.mk
+++ b/lang/tcl-itcl-current/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/15 22:02:56 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 TCL_ITCL_CURRENT_BUILDLINK3_MK:=	${TCL_ITCL_CURRENT_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl-current}
 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
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 6d84b18d1d1..1404b0064cf 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_ITCL_BUILDLINK3_MK:=	${TCL_ITCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-itcl}
 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
 
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index 153a3da8e5b..1a868102ba0 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_OTCL_BUILDLINK3_MK:=	${TCL_OTCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-otcl}
 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
 
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 5ffbadc6289..768ce487189 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/26 21:11:28 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/04/06 06:22:15 reed Exp $
 #
 
 DISTNAME=	tclx8.3.5-src
@@ -14,7 +14,7 @@ COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 .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
 
diff --git a/lang/tcl-tclX/buildlink3.mk b/lang/tcl-tclX/buildlink3.mk
index f7399f6ae65..e7afc0e6828 100644
--- a/lang/tcl-tclX/buildlink3.mk
+++ b/lang/tcl-tclX/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TCL_TCLX_BUILDLINK3_MK:=	${TCL_TCLX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-tclX}
 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
 
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 6c61de71a41..cfaae78da85 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 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*
diff --git a/lang/tcl83/buildlink3.mk b/lang/tcl83/buildlink3.mk
index fe4f710d613..c8a2ec55c03 100644
--- a/lang/tcl83/buildlink3.mk
+++ b/lang/tcl83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/04/24 22:41:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl}
 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*
diff --git a/lang/win32-jdk/buildlink3.mk b/lang/win32-jdk/buildlink3.mk
index ade59e1ffde..b1cbba9907d 100644
--- a/lang/win32-jdk/buildlink3.mk
+++ b/lang/win32-jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/10/11 13:37:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:15 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WIN32_JDK_BUILDLINK3_MK:=	${WIN32_JRE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwin32-jdk}
 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
author	reed <reed>	2006-04-06 06:21:32 +0000
committer	reed <reed>	2006-04-06 06:21:32 +0000
commit	7091841754a8a638d0a670a1c736986077d4d43c (patch)
tree	b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /lang
parent	d42a5d51fa206e34bd9b954c36d21398c8b846cb (diff)
download	pkgsrc-7091841754a8a638d0a670a1c736986077d4d43c.tar.gz