summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorwiz <wiz>2006-04-13 21:45:12 +0000
committerwiz <wiz>2006-04-13 21:45:12 +0000
commit7b014939a401c71e3a85fe90b2cc7aa00793a75f (patch)
treedf83175fa75029d606eaa4c0306c97cb82c83b46 /databases
parent2b6d2b7c1cd9910fb84ec1a329435ef7b5a418a1 (diff)
downloadpkgsrc-7b014939a401c71e3a85fe90b2cc7aa00793a75f.tar.gz
Update path from cyrus-sasl2 to cyrus-sasl.
Diffstat (limited to 'databases')
-rw-r--r--databases/openldap/buildlink3.mk4
-rw-r--r--databases/openldap/options.mk4
-rw-r--r--databases/py-ldap/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index f69f5504947..5b44a936517 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/13 21:45:13 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -30,7 +30,7 @@ MAKEVARS+= PKG_BUILD_OPTIONS.openldap
.if !empty(PKG_BUILD_OPTIONS.openldap:Mkerberos) || \
!empty(PKG_BUILD_OPTIONS.openldap:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
.include "../../security/openssl/buildlink3.mk"
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
index a688793fcf9..ce9e2f25c7d 100644
--- a/databases/openldap/options.mk
+++ b/databases/openldap/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2006/04/06 06:21:41 reed Exp $
+# $NetBSD: options.mk,v 1.17 2006/04/13 21:45:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
@@ -62,7 +62,7 @@ PKG_OPTIONS+= sasl
.if !empty(PKG_OPTIONS:Msasl)
CONFIGURE_ARGS+= --with-cyrus-sasl
BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cyrus-sasl
.endif
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 3f1eef16f62..48bf97739aa 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/13 21:45:13 wiz Exp $
DISTNAME= python-ldap-2.0.10
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -20,7 +20,7 @@ SUBST_SED.setup= -e "s|@EXTRALIBS@|${BUILDLINK_PREFIX.cyrus-sasl}/lib ${BUILDLI
-e "s|@EXTRAINCS@|${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl ${BUILDLINK_PREFIX.openldap}/include|"
.include "../../databases/openldap/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../lang/python/extension.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == ""