diff options
| author | reed <reed> | 2006-04-06 06:21:32 +0000 |
|---|---|---|
| committer | reed <reed> | 2006-04-06 06:21:32 +0000 |
| commit | 3b50716541c42bd031d14157665a74004901cade (patch) | |
| tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /security/skey | |
| parent | 87fa6a3117eca2724176d2d7eb11a42a1a99df66 (diff) | |
| download | pkgsrc-3b50716541c42bd031d14157665a74004901cade.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 'security/skey')
| -rw-r--r-- | security/skey/buildlink3.mk | 6 | ||||
| -rw-r--r-- | security/skey/builtin.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/security/skey/buildlink3.mk b/security/skey/buildlink3.mk index 66a403b5540..c7f1ca57834 100644 --- a/security/skey/buildlink3.mk +++ b/security/skey/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:10:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2006/04/06 06:22:44 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SKEY_BUILDLINK3_MK:= ${SKEY_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nskey} BUILDLINK_PACKAGES+= skey .if !empty(SKEY_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.skey+= skey>=1.1.5 -BUILDLINK_RECOMMENDED.skey?= skey>=1.1.5nb2 +BUILDLINK_API_DEPENDS.skey+= skey>=1.1.5 +BUILDLINK_ABI_DEPENDS.skey?= skey>=1.1.5nb2 BUILDLINK_PKGSRCDIR.skey?= ../../security/skey BUILDLINK_DEPMETHOD.skey?= build .endif # SKEY_BUILDLINK3_MK diff --git a/security/skey/builtin.mk b/security/skey/builtin.mk index 6f79b3f79d4..9c6a0c09455 100644 --- a/security/skey/builtin.mk +++ b/security/skey/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2006/03/30 18:06:18 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:44 reed Exp $ BUILTIN_PKG:= skey @@ -45,7 +45,7 @@ USE_BUILTIN.skey= ${IS_BUILTIN.skey} . if defined(BUILTIN_PKG.skey) && \ !empty(IS_BUILTIN.skey:M[yY][eE][sS]) USE_BUILTIN.skey= yes -. for _dep_ in ${BUILDLINK_DEPENDS.skey} +. for _dep_ in ${BUILDLINK_API_DEPENDS.skey} . if !empty(USE_BUILTIN.skey:M[yY][eE][sS]) USE_BUILTIN.skey!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.skey:Q}; then \ |