diff options
| author | tron <tron> | 2008-09-09 22:25:02 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-09-09 22:25:02 +0000 |
| commit | d1301cb454b1103a6b89a11ca8186ad3287c296f (patch) | |
| tree | 7a9b93da6a75e2bcab7b4565527e7ff5876a9c9b /databases/openldap-server | |
| parent | cc9c91253e7e9c79e628b608b7fe360074dd4ff3 (diff) | |
| download | pkgsrc-d1301cb454b1103a6b89a11ca8186ad3287c296f.tar.gz | |
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 (limited to 'databases/openldap-server')
| -rw-r--r-- | databases/openldap-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/openldap-server/options.mk | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 48cf727d469..d0d8f7f2737 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -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 --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk index 68907d65ac5..480a49807ea 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -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 @@ PKG_SUGGESTED_OPTIONS= bdb ### .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" |