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

11 files changed, 27 insertions, 27 deletions

diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index d1f369cccb4..c88b33447d5 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2005/05/26 15:03:11 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2006/04/06 06:21:32 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=	${BZIP2_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbzip2}
 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/+$//}
diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk
index 8c76957760f..9bf465dd605 100644
--- a/archivers/bzip2/builtin.mk
+++ b/archivers/bzip2/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:32 reed Exp $
 
 BUILTIN_PKG:=	bzip2
 
@@ -32,7 +32,7 @@ USE_BUILTIN.bzip2=	${IS_BUILTIN.bzip2}
 .    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	\
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 96d39034a41..3a342971486 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/30 21:28:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/06 06:21:32 reed Exp $
 #
 
 DISTNAME=	file-roller-2.14.0
@@ -24,9 +24,9 @@ USE_PKGLOCALEDIR=	yes
 
 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"
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 97be5451a11..36a4f1aa765 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2006/04/06 06:21:32 reed Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -35,7 +35,7 @@ CONFIGURE_ENV+=		SH=${TOOLS_SH:Q}
 # 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
 
diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk
index f60ee51862b..e4be5381553 100644
--- a/archivers/libcomprex/buildlink3.mk
+++ b/archivers/libcomprex/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:04 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCOMPREX_BUILDLINK3_MK:=	${LIBCOMPREX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibcomprex}
 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
 
diff --git a/archivers/liblzo/buildlink3.mk b/archivers/liblzo/buildlink3.mk
index 168cb00cd04..de0bfac1d34 100644
--- a/archivers/liblzo/buildlink3.mk
+++ b/archivers/liblzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLZO_BUILDLINK3_MK:=	${LIBLZO_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliblzo}
 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/+$//}
diff --git a/archivers/libzip/buildlink3.mk b/archivers/libzip/buildlink3.mk
index c94749f07d8..8217d8b8d23 100644
--- a/archivers/libzip/buildlink3.mk
+++ b/archivers/libzip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/06/22 21:11:39 dillo Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZIP_BUILDLINK3_MK:=	${LIBZIP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibzip}
 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
 
diff --git a/archivers/lzo/buildlink3.mk b/archivers/lzo/buildlink3.mk
index 263104be18c..b9e8f565f44 100644
--- a/archivers/lzo/buildlink3.mk
+++ b/archivers/lzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/07/14 20:05:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LZO_BUILDLINK3_MK:=	${LZO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlzo}
 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
 
diff --git a/archivers/szip/buildlink3.mk b/archivers/szip/buildlink3.mk
index 5a624582f4d..1bfed76cbf4 100644
--- a/archivers/szip/buildlink3.mk
+++ b/archivers/szip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/02/24 16:20:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SZIP_BUILDLINK3_MK:=	${SZIP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nszip}
 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
 
diff --git a/archivers/ucl/buildlink3.mk b/archivers/ucl/buildlink3.mk
index ae9c3811d12..6b7464e7aa6 100644
--- a/archivers/ucl/buildlink3.mk
+++ b/archivers/ucl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/15 16:58:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:21:33 reed Exp $
 # XXX
 # XXX This file was created automatically using createbuildlink-3.10.
 # XXX After this file has been verified as correct, the comment lines
@@ -21,7 +21,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nucl}
 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
 
diff --git a/archivers/zziplib/buildlink3.mk b/archivers/zziplib/buildlink3.mk
index 69fb3564a63..6ca1f8ea6ad 100644
--- a/archivers/zziplib/buildlink3.mk
+++ b/archivers/zziplib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:21:33 reed Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZZIPLIB_BUILDLINK3_MK:=	${ZZIPLIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzziplib}
 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