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

9 files changed, 26 insertions, 26 deletions

diff --git a/converters/fribidi/buildlink3.mk b/converters/fribidi/buildlink3.mk
index 400f1143c47..5dbe7332d07 100644
--- a/converters/fribidi/buildlink3.mk
+++ b/converters/fribidi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:39 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FRIBIDI_BUILDLINK3_MK:=	${FRIBIDI_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfribidi}
 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
 
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index ea1338534b0..236721d0c43 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Niconv}
 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
 
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 59d24953110..134ba9792cf 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.16 2006/04/06 06:21:40 reed Exp $
 
 BUILTIN_PKG:=	iconv
 
@@ -63,7 +63,7 @@ USE_BUILTIN.iconv=	${IS_BUILTIN.iconv}
 .    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	\
diff --git a/converters/libwpd/buildlink3.mk b/converters/libwpd/buildlink3.mk
index 7a234052ff3..5f3a5a19c72 100644
--- a/converters/libwpd/buildlink3.mk
+++ b/converters/libwpd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/08 09:42:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWPD_BUILDLINK3_MK:=	${LIBWPD_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibwpd}
 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
 
diff --git a/converters/psiconv/buildlink3.mk b/converters/psiconv/buildlink3.mk
index 0eedace4165..48ef17ad656 100644
--- a/converters/psiconv/buildlink3.mk
+++ b/converters/psiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/12/28 23:18:18 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PSICONV_BUILDLINK3_MK:=	${PSICONV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsiconv}
 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
 
diff --git a/converters/recode/buildlink3.mk b/converters/recode/buildlink3.mk
index 460040d1b50..405b5453626 100644
--- a/converters/recode/buildlink3.mk
+++ b/converters/recode/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RECODE_BUILDLINK3_MK:=	${RECODE_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrecode}
 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
 
diff --git a/converters/uulib/buildlink3.mk b/converters/uulib/buildlink3.mk
index 50cabfad9c0..f9cb327a38c 100644
--- a/converters/uulib/buildlink3.mk
+++ b/converters/uulib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UULIB_BUILDLINK3_MK:=	${UULIB_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nuulib}
 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
 
diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk
index c8fcff4357f..79d20af8a4d 100644
--- a/converters/wv/buildlink3.mk
+++ b/converters/wv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WV_BUILDLINK3_MK:=	${WV_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwv}
 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
 
diff --git a/converters/wv2/buildlink3.mk b/converters/wv2/buildlink3.mk
index ec5eaf4d1ef..ecc6e45dbb0 100644
--- a/converters/wv2/buildlink3.mk
+++ b/converters/wv2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:40 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WV2_BUILDLINK3_MK:=	${WV2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwv2}
 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