summaryrefslogtreecommitdiff
path: root/databases/openldap
diff options
context:
space:
mode:
authorreed <reed>2006-04-06 06:21:32 +0000
committerreed <reed>2006-04-06 06:21:32 +0000
commit3b50716541c42bd031d14157665a74004901cade (patch)
treeb6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /databases/openldap
parent87fa6a3117eca2724176d2d7eb11a42a1a99df66 (diff)
downloadpkgsrc-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 'databases/openldap')
-rw-r--r--databases/openldap/buildlink3.mk4
-rw-r--r--databases/openldap/options.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b918f81acf4..b3c678d27b3 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/01/06 15:10:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/04/06 06:21:41 reed Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenldap}
BUILDLINK_PACKAGES+= openldap
.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+= openldap>=2.3.11nb2
+BUILDLINK_API_DEPENDS.openldap+= openldap>=2.3.11nb2
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
# Export the deprecated API from the openldap-2.2.x releases.
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index 708bb709c27..a688793fcf9 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2005/12/29 20:10:23 ghen Exp $
+# $NetBSD: options.mk,v 1.16 2006/04/06 06:21:41 reed Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
@@ -61,7 +61,7 @@ PKG_OPTIONS+= sasl
###
.if !empty(PKG_OPTIONS:Msasl)
CONFIGURE_ARGS+= --with-cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
+BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
. include "../../security/cyrus-sasl2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cyrus-sasl