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/openssl | |
| 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/openssl')
| -rw-r--r-- | security/openssl/buildlink3.mk | 6 | ||||
| -rw-r--r-- | security/openssl/builtin.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 82a846a07e2..b3945811336 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2006/02/05 23:10:45 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2006/04/06 06:22:43 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -13,8 +13,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenssl} BUILDLINK_PACKAGES+= openssl .if !empty(OPENSSL_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.openssl+= openssl>=0.9.6m -BUILDLINK_RECOMMENDED.openssl+= openssl>=0.9.7inb1 +BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.6m +BUILDLINK_ABI_DEPENDS.openssl+= openssl>=0.9.7inb1 BUILDLINK_PKGSRCDIR.openssl?= ../../security/openssl # Ensure that -lcrypt comes before -lcrypto when linking so that the diff --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index 07c7dcd6dd9..d371540fa9f 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.18 2006/03/30 18:06:18 jlam Exp $ +# $NetBSD: builtin.mk,v 1.19 2006/04/06 06:22:43 reed Exp $ BUILTIN_PKG:= openssl @@ -112,7 +112,7 @@ USE_BUILTIN.openssl= ${IS_BUILTIN.openssl} . if defined(BUILTIN_PKG.openssl) && \ !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) USE_BUILTIN.openssl= yes -. for _dep_ in ${BUILDLINK_DEPENDS.openssl} +. for _dep_ in ${BUILDLINK_API_DEPENDS.openssl} . if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) USE_BUILTIN.openssl!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \ |