[pkgsrc/trunk]: pkgsrc/mk Enable OpenLDAP support in devel/apr, by default it...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f9edeb5b03c
branches:  trunk
changeset: 478093:8f9edeb5b03c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Jul 16 23:21:50 2004 +0000

description:
Enable OpenLDAP support in devel/apr, by default it's disabled.
If you want to use it, "APR_USE_OPENLDAP" should be set to [Yy][Ee][Ss].

This closes PR pkg/25356.

diffstat:

 devel/apr/Makefile      |  15 ++++++++++++---
 devel/apr/buildlink3.mk |   5 ++++-
 mk/bsd.pkg.defaults.mk  |   7 ++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diffs (79 lines):

diff -r e79305ff10c4 -r 8f9edeb5b03c devel/apr/Makefile
--- a/devel/apr/Makefile        Fri Jul 16 23:01:41 2004 +0000
+++ b/devel/apr/Makefile        Fri Jul 16 23:21:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/03/22 19:50:16 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/16 23:21:50 xtraeme Exp $
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
 CATEGORIES=    devel
@@ -39,7 +39,10 @@
                --without-gdbm
 
 .include "../../mk/bsd.prefs.mk"
-.if ${APR_USE_DB4} == "YES"
+
+BUILD_DEFS+=           APR_USE_OPENLDAP
+
+.if !empty(APR_USE_DB4:M[Yy][Ee][Ss])
 APU_CONFIGURE_ARGS+=\
        --with-berkeley-db=${BUILDLINK_PREFIX.db4}/include:${LOCALBASE}
 .else
@@ -58,9 +61,15 @@
 
 .include "../../www/apache2/Makefile.common"
 
-.if ${APR_USE_DB4} == "YES"
+.if !empty(APR_USE_DB4:M[Yy][Ee][Ss)
 .include "../../databases/db4/buildlink3.mk"
 .endif
 
+# Enable OpenLDAP support
+.if !empty(APR_USE_OPENLDAP:M[Yy][Ee][Ss])
+APU_CONFIGURE_ARGS+=   --with-ldap
+.include "../../databases/openldap/buildlink3.mk"
+.endif
+
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e79305ff10c4 -r 8f9edeb5b03c devel/apr/buildlink3.mk
--- a/devel/apr/buildlink3.mk   Fri Jul 16 23:01:41 2004 +0000
+++ b/devel/apr/buildlink3.mk   Fri Jul 16 23:21:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/07/14 08:31:12 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/07/16 23:21:50 xtraeme Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=    ${APR_BUILDLINK3_MK}+
@@ -23,7 +23,10 @@
 
 .if !empty(APR_USE_DB4:M[yY][eE][sS])
 .  include "../../databases/db4/buildlink3.mk"
+.elif !empty(APR_USE_OPENLDAP:M[Yy][Ee][Ss])
+.  include "../../databases/openldap/buildlink3.mk"
 .endif
+
 .include "../../textproc/expat/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r e79305ff10c4 -r 8f9edeb5b03c mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Fri Jul 16 23:01:41 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Fri Jul 16 23:21:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.258 2004/07/14 00:25:11 xtraeme Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.259 2004/07/16 23:21:50 xtraeme Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -621,6 +621,11 @@
 # there.
 # Default: YES
 
+APR_USE_OPENLDAP?=     NO
+# Used in apr to enable OpenLDAP support.
+# Possible: yes or no.
+# Default: no.
+
 ARLA_CACHE?=   ${LOCALBASE}/cache
 # Used in arla to specify the location of the cache used by arla. Should
 # be on a local disk.