[pkgsrc/trunk]: pkgsrc/databases/openldap-server Alway use Berkeley DB 4.6.21...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/88576cbd504f
branches:  trunk
changeset: 547598:88576cbd504f
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Sep 22 08:46:32 2008 +0000

description:
Alway use Berkeley DB 4.6.21 provided by the "db46" package.
Berkeley DB 4.7.x is not officially supported by OpenLDAP yet and there
have been various reports of problems with this combination.

Bump package revision.

diffstat:

 databases/openldap-server/Makefile   |   4 ++--
 databases/openldap-server/options.mk |  19 ++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diffs (46 lines):

diff -r f72c5e1d549e -r 88576cbd504f databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile        Mon Sep 22 08:34:22 2008 +0000
+++ b/databases/openldap-server/Makefile        Mon Sep 22 08:46:32 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2008/09/09 22:25:02 tron Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/22 08:46:32 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           2
+PKGREVISION=           3
 COMMENT=               Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=            openldap<2.3.23nb1
diff -r f72c5e1d549e -r 88576cbd504f databases/openldap-server/options.mk
--- a/databases/openldap-server/options.mk      Mon Sep 22 08:34:22 2008 +0000
+++ b/databases/openldap-server/options.mk      Mon Sep 22 08:46:32 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2008/09/10 12:43:18 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2008/09/22 08:46:32 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd
@@ -16,20 +16,9 @@
 ###
 
 .if !empty(PKG_OPTIONS:Mbdb)
-.  if !empty(MACHINE_PLATFORM:MNetBSD-[0-4].*-*) && \
-      empty(MACHINE_PLATFORM:MNetBSD-4.99.*-*)
-.    include "../../databases/db46/buildlink3.mk"
-# "slapd" locks up when used with Berkeley DB 4.7.x on a NetBSD system which
-# uses SA based POSIX threads. We therefore use the "db46" package with
-# version 4.6.x of Berkeley DB. Please look at PR pkg/39500 for more details.
-BDB_TYPE=      db46
-.  else
-BDB_ACCEPTED=          db4 # db3?
-.    include "../../mk/bdb.buildlink3.mk"
-.  endif
-.endif
-BDB_TYPE?=             none
-.if ${BDB_TYPE} != "none"
+# "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"
 CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
 TEST_TARGET=           test
 .else