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). --- x11/compositeext/buildlink3.mk | 6 +++--- x11/compositeext/builtin.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'x11/compositeext') diff --git a/x11/compositeext/buildlink3.mk b/x11/compositeext/buildlink3.mk index 531e6a352e4..e31d93c16f7 100644 --- a/x11/compositeext/buildlink3.mk +++ b/x11/compositeext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:11:31 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2006/04/06 06:22:57 reed Exp $ # # This Makefile fragment is included by packages that use compositeext. # @@ -12,8 +12,8 @@ BUILDLINK_DEPENDS+= compositeext .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" diff --git a/x11/compositeext/builtin.mk b/x11/compositeext/builtin.mk index 2d536a2d9ce..9433d3f9198 100644 --- a/x11/compositeext/builtin.mk +++ b/x11/compositeext/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.6 2006/03/30 18:06:19 jlam Exp $ +# $NetBSD: builtin.mk,v 1.7 2006/04/06 06:22:57 reed Exp $ BUILTIN_PKG:= compositeext @@ -40,7 +40,7 @@ USE_BUILTIN.compositeext= ${IS_BUILTIN.compositeext} . 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 \ -- cgit v1.2.3