From 5abef9be142e900cceace758044a1b2ee493daf3 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 6 Apr 2006 06:21:32 +0000 Subject: 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). --- converters/libiconv/buildlink3.mk | 6 +++--- converters/libiconv/builtin.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'converters/libiconv') 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 \ -- cgit v1.2.3