diff options
| author | ghen <ghen> | 2009-04-27 07:13:01 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2009-04-27 07:13:01 +0000 |
| commit | 72ef04373ba34ef506b5cf5fb762e9d4b1cdc29a (patch) | |
| tree | f1a6b6c872b8e46eeac3eec80ca7f4901ba841a1 | |
| parent | 06040f5830a37a83160c4a01cac80b724afa9a80 (diff) | |
| download | pkgsrc-72ef04373ba34ef506b5cf5fb762e9d4b1cdc29a.tar.gz | |
Switch OpenLDAP server and modules to use database/db4 as a backend again,
now db 4.7 is known to work. Ok adam, manu.
| -rw-r--r-- | databases/openldap-cloak/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap-nops/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap-server/options.mk | 6 | ||||
| -rw-r--r-- | databases/openldap-smbk5pwd/Makefile | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile index 0f090aa49a4..38f6e3a3b74 100644 --- a/databases/openldap-cloak/Makefile +++ b/databases/openldap-cloak/Makefile @@ -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 @@ do-install: .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 --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile index 1952ea69b3c..78cc4b98bb9 100644 --- a/databases/openldap-nops/Makefile +++ b/databases/openldap-nops/Makefile @@ -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 @@ do-install: .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 --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk index dd1791cafeb..26cdf80edf7 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= bdb ### .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 --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile index 73f16bf9082..1e551c02a6a 100644 --- a/databases/openldap-smbk5pwd/Makefile +++ b/databases/openldap-smbk5pwd/Makefile @@ -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 @@ do-install: .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" |