[pkgsrc/trunk]: pkgsrc/databases/openldap-server Fix buildling with db5; revb...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d41c9aabf07
branches:  trunk
changeset: 576116:7d41c9aabf07
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 02 12:15:29 2010 +0000

description:
Fix buildling with db5; revbump for db4 update

diffstat:

 databases/openldap-server/Makefile   |   3 ++-
 databases/openldap-server/options.mk |  15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r 6e0c8376a4c2 -r 7d41c9aabf07 databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile        Wed Jun 02 12:09:35 2010 +0000
+++ b/databases/openldap-server/Makefile        Wed Jun 02 12:15:29 2010 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/02/19 20:49:29 ghen Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/02 12:15:29 adam Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
+PKGREVISION=           1
 COMMENT=               Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=            openldap<2.3.23nb1
diff -r 6e0c8376a4c2 -r 7d41c9aabf07 databases/openldap-server/options.mk
--- a/databases/openldap-server/options.mk      Wed Jun 02 12:09:35 2010 +0000
+++ b/databases/openldap-server/options.mk      Wed Jun 02 12:15:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2009/06/27 09:55:09 ghen Exp $
+# $NetBSD: options.mk,v 1.13 2010/06/02 12:15:29 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb sasl slp inet6 smbk5pwd dso
@@ -14,11 +14,19 @@
 ### NOTE: that option is enabled, because the openldap server needs
 ###      to have local storage support to work as standalone.
 ###
-
 .if !empty(PKG_OPTIONS:Mbdb)
-.  include "../../databases/db4/buildlink3.mk"
+BDB_ACCEPTED=          db4 db5
 CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
 TEST_TARGET=           test
+# Fix hard-coded support for db4.
+# Remove if fixed in future versions of OpenLDAP.
+SUBST_CLASSES=         bdb
+SUBST_MESSAGE.bdb=     Fixing bdb library.
+SUBST_STAGE.bdb=       pre-configure
+SUBST_FILES.bdb=       ${WRKSRC}/configure
+SUBST_SED.bdb=         -e 's,-ldb4,-l${BDB_TYPE},g'
+SUBST_SED.bdb+=                -e 's,ol_cv_bdb_major = 4,ol_cv_bdb_major > 3,g'
+.  include "../../mk/bdb.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-bdb --disable-hdb
 .endif
@@ -76,7 +84,6 @@
 ###
 ### smbk5pwd support (sync samba and kerberos passwords on password changes)
 ###
-
 .if !empty(PKG_OPTIONS:Msmbk5pwd)
 PKG_FAIL_REASON+=      "smbk5pwd option to openldap-server is now " \
                        "available through the openldap-smbk5pwd package"