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 | 5a90099f096f9f96d89501e9046889e4d639d9e9 (patch) | |
| tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /www/apache2 | |
| parent | 21a75a2555bbbb0465d1e0ac639372e79a7e15dd (diff) | |
| download | pkgsrc-5a90099f096f9f96d89501e9046889e4d639d9e9.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 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 4 | ||||
| -rw-r--r-- | www/apache2/buildlink3.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 68f24c07b79..731c27ececd 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2006/02/05 23:11:18 joerg Exp $ +# $NetBSD: Makefile,v 1.96 2006/04/06 06:22:53 reed Exp $ .include "Makefile.common" @@ -27,7 +27,7 @@ CONFIGURE_ENV+= perlbin=${PERL5:Q} CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} -BUILDLINK_DEPENDS.apr+= apr>=0.9.7.2.0.55 +BUILDLINK_API_DEPENDS.apr+= apr>=0.9.7.2.0.55 .include "../../mk/bsd.prefs.mk" .include "../../devel/apr/buildlink3.mk" diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index be51e0b9c92..8e14ef1a39e 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2006/02/05 23:11:19 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2006/04/06 06:22:53 reed Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache} BUILDLINK_PACKAGES+= apache .if !empty(APACHE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.apache+= apache>=2.0.51 -BUILDLINK_RECOMMENDED.apache+= apache>=2.0.55nb7 +BUILDLINK_API_DEPENDS.apache+= apache>=2.0.51 +BUILDLINK_ABI_DEPENDS.apache+= apache>=2.0.55nb7 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache2 BUILDLINK_DEPMETHOD.apache?= build . if defined(APACHE_MODULE) |