diff options
| author | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
| commit | 5abef9be142e900cceace758044a1b2ee493daf3 (patch) | |
| tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /graphics/xpm | |
| parent | d4d013cda2a033b026f37936932a1fbee6613fbc (diff) | |
| download | pkgsrc-5abef9be142e900cceace758044a1b2ee493daf3.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 'graphics/xpm')
| -rw-r--r-- | graphics/xpm/buildlink3.mk | 6 | ||||
| -rw-r--r-- | graphics/xpm/builtin.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk index fb8b5229229..048256c1903 100644 --- a/graphics/xpm/buildlink3.mk +++ b/graphics/xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/02/05 23:09:41 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2006/04/06 06:22:06 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XPM_BUILDLINK3_MK:= ${XPM_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxpm} BUILDLINK_PACKAGES+= xpm .if !empty(XPM_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xpm+= xpm>=3.4k -BUILDLINK_RECOMMENDED.xpm?= xpm>=3.4knb6 +BUILDLINK_API_DEPENDS.xpm+= xpm>=3.4k +BUILDLINK_ABI_DEPENDS.xpm?= xpm>=3.4knb6 BUILDLINK_PKGSRCDIR.xpm?= ../../graphics/xpm .endif # XPM_BUILDLINK3_MK diff --git a/graphics/xpm/builtin.mk b/graphics/xpm/builtin.mk index eceebda0e4d..286b0968344 100644 --- a/graphics/xpm/builtin.mk +++ b/graphics/xpm/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.11 2006/03/30 18:06:18 jlam Exp $ +# $NetBSD: builtin.mk,v 1.12 2006/04/06 06:22:06 reed Exp $ BUILTIN_PKG:= xpm @@ -63,7 +63,7 @@ USE_BUILTIN.xpm= ${IS_BUILTIN.xpm} . if defined(BUILTIN_PKG.xpm) && \ !empty(IS_BUILTIN.xpm:M[yY][eE][sS]) USE_BUILTIN.xpm= yes -. for _dep_ in ${BUILDLINK_DEPENDS.xpm} +. for _dep_ in ${BUILDLINK_API_DEPENDS.xpm} . if !empty(USE_BUILTIN.xpm:M[yY][eE][sS]) USE_BUILTIN.xpm!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xpm:Q}; then \ |