[pkgsrc/trunk]: pkgsrc/databases/openldap-server Depend on the "db46" package...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5cb02c4641af
branches:  trunk
changeset: 546932:5cb02c4641af
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Sep 09 22:25:02 2008 +0000

description:
Depend on the "db46" package under NetBSD versions that use SA threads.
Bump package revision.

This is the second half of the fix for PR pkg/39500.

diffstat:

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

diffs (38 lines):

diff -r 0f1007f352f8 -r 5cb02c4641af databases/openldap-server/Makefile
--- a/databases/openldap-server/Makefile        Tue Sep 09 22:23:32 2008 +0000
+++ b/databases/openldap-server/Makefile        Tue Sep 09 22:25:02 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2008/09/07 12:18:07 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/09/09 22:25:02 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               Lightweight Directory Access Protocol server suite
 
 CONFLICTS+=            openldap<2.3.23nb1
diff -r 0f1007f352f8 -r 5cb02c4641af databases/openldap-server/options.mk
--- a/databases/openldap-server/options.mk      Tue Sep 09 22:23:32 2008 +0000
+++ b/databases/openldap-server/options.mk      Tue Sep 09 22:25:02 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2007/08/28 14:33:27 tron Exp $
+# $NetBSD: options.mk,v 1.6 2008/09/09 22:25:02 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp inet6 smbk5pwd
@@ -16,8 +16,14 @@
 ###
 
 .if !empty(PKG_OPTIONS:Mbdb)
+.  if !empty(MACHINE_PLATFORM:MNetBSD-[0-4].*-*) && \
+      empty(MACHINE_PLATFORM:MNetBSD-4.99.*-*)
+.    include "../../databases/db46/buildlink3.mk"
+BDB_TYPE=      db46
+.  else
 BDB_ACCEPTED=          db4 # db3?
-.  include "../../mk/bdb.buildlink3.mk"
+.    include "../../mk/bdb.buildlink3.mk"
+.  endif
 .endif
 BDB_TYPE?=             none
 .if ${BDB_TYPE} != "none"