[pkgsrc/trunk]: pkgsrc/databases Switch OpenLDAP server and modules to use da...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/06e5ede61119
branches:  trunk
changeset: 392131:06e5ede61119
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Apr 27 07:13:01 2009 +0000

description:
Switch OpenLDAP server and modules to use database/db4 as a backend again,
now db 4.7 is known to work.  Ok adam, manu.

diffstat:

 databases/openldap-cloak/Makefile    |  4 ++--
 databases/openldap-nops/Makefile     |  4 ++--
 databases/openldap-server/options.mk |  6 ++----
 databases/openldap-smbk5pwd/Makefile |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r e63b2c633dab -r 06e5ede61119 databases/openldap-cloak/Makefile
--- a/databases/openldap-cloak/Makefile Mon Apr 27 04:22:00 2009 +0000
+++ b/databases/openldap-cloak/Makefile Mon Apr 27 07:13:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/14 19:41:54 manu Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/27 07:13:01 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-cloak-/}
 COMMENT=               Remove null-ops for OpenLDAP
@@ -24,7 +24,7 @@
 
 .include "../../databases/openldap/Makefile.common"
 
-.include "../../databases/db46/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r e63b2c633dab -r 06e5ede61119 databases/openldap-nops/Makefile
--- a/databases/openldap-nops/Makefile  Mon Apr 27 04:22:00 2009 +0000
+++ b/databases/openldap-nops/Makefile  Mon Apr 27 07:13:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/02/25 20:31:41 manu Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/27 07:13:02 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-nops-/}
 COMMENT=               Remove null-ops for OpenLDAP
@@ -24,7 +24,7 @@
 
 .include "../../databases/openldap/Makefile.common"
 
-.include "../../databases/db46/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r e63b2c633dab -r 06e5ede61119 databases/openldap-server/options.mk
--- a/databases/openldap-server/options.mk      Mon Apr 27 04:22:00 2009 +0000
+++ b/databases/openldap-server/options.mk      Mon Apr 27 07:13:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2009/01/31 15:59:05 manu Exp $
+# $NetBSD: options.mk,v 1.11 2009/04/27 07:13:02 ghen Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd dso
@@ -16,9 +16,7 @@
 ###
 
 .if !empty(PKG_OPTIONS:Mbdb)
-# "slapd" locks up when used with Berkeley DB 4.7.x. We therefore use the
-# "db46" package with version 4.6.x of Berkeley DB.
-.  include "../../databases/db46/buildlink3.mk"
+.  include "../../databases/db4/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
 TEST_TARGET=           test
 .else
diff -r e63b2c633dab -r 06e5ede61119 databases/openldap-smbk5pwd/Makefile
--- a/databases/openldap-smbk5pwd/Makefile      Mon Apr 27 04:22:00 2009 +0000
+++ b/databases/openldap-smbk5pwd/Makefile      Mon Apr 27 07:13:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/01/31 17:45:00 manu Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/27 07:13:02 ghen Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-smbk5pwd-/}
 COMMENT=               Samba and Kerberos password sync for OpenLDAP
@@ -22,7 +22,7 @@
 
 .include "../../databases/openldap/Makefile.common"
 
-.include "../../databases/db46/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"