diff options
| 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 /x11/xorg-libs | |
| parent | d42a5d51fa206e34bd9b954c36d21398c8b846cb (diff) | |
| download | pkgsrc-7091841754a8a638d0a670a1c736986077d4d43c.tar.gz | |
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).
Diffstat (limited to 'x11/xorg-libs')
| -rw-r--r-- | x11/xorg-libs/buildlink3.mk | 6 | ||||
| -rw-r--r-- | x11/xorg-libs/builtin.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk index e1c440deebb..8dcdabc53a0 100644 --- a/x11/xorg-libs/buildlink3.mk +++ b/x11/xorg-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2006/02/23 23:17:30 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:23:05 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+ @@ -18,8 +18,8 @@ BUILDLINK_PACKAGES:= xorg-libs ${BUILDLINK_PACKAGES} .if !empty(XORG_LIBS_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xorg-libs+= xorg-libs>=6.9.0 -BUILDLINK_RECOMMENDED.xorg-libs?= xorg-libs>=6.9.0nb2 +BUILDLINK_API_DEPENDS.xorg-libs+= xorg-libs>=6.9.0 +BUILDLINK_ABI_DEPENDS.xorg-libs?= xorg-libs>=6.9.0nb2 BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs BUILDLINK_LIBDIRS.xorg-libs?= ${X11ROOT_PREFIX}/lib BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" diff --git a/x11/xorg-libs/builtin.mk b/x11/xorg-libs/builtin.mk index 7e85d9df883..ff7d083d711 100644 --- a/x11/xorg-libs/builtin.mk +++ b/x11/xorg-libs/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.4 2006/03/30 18:06:19 jlam Exp $ +# $NetBSD: builtin.mk,v 1.5 2006/04/06 06:23:05 reed Exp $ BUILTIN_PKG:= xorg-libs @@ -43,7 +43,7 @@ USE_BUILTIN.xorg-libs= ${IS_BUILTIN.xorg-libs} . if defined(BUILTIN_PKG.xorg-libs) && \ !empty(IS_BUILTIN.xorg-libs:M[yY][eE][sS]) USE_BUILTIN.xorg-libs= yes -. for _dep_ in ${BUILDLINK_DEPENDS.xorg-libs} +. for _dep_ in ${BUILDLINK_API_DEPENDS.xorg-libs} . if !empty(USE_BUILTIN.xorg-libs:M[yY][eE][sS]) USE_BUILTIN.xorg-libs!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xorg-libs:Q}; then \ |