diff options
| author | adam <adam@pkgsrc.org> | 2010-06-02 12:15:29 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-06-02 12:15:29 +0000 |
| commit | 28af5e28a76d385f3cd37423c91f3911e017aa96 (patch) | |
| tree | c626905d8538697aa4ebc8aab693a1a778b03090 | |
| parent | f3627d49c02fad54f8e7ceb31f5f99d9c2e80e64 (diff) | |
| download | pkgsrc-28af5e28a76d385f3cd37423c91f3911e017aa96.tar.gz | |
Fix buildling with db5; revbump for db4 update
| -rw-r--r-- | databases/openldap-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/openldap-server/options.mk | 15 |
2 files changed, 13 insertions, 5 deletions
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 14c1ff42a91..91f08b275af 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2010/02/19 20:49:29 ghen Exp $ +# $NetBSD: Makefile,v 1.25 2010/06/02 12:15:29 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} +PKGREVISION= 1 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 7e686224dcc..08af56df765 100644 --- a/databases/openldap-server/options.mk +++ b/databases/openldap-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2009/06/27 09:55:09 ghen Exp $ +# $NetBSD: options.mk,v 1.13 2010/06/02 12:15:29 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server PKG_SUPPORTED_OPTIONS= bdb sasl slp inet6 smbk5pwd dso @@ -14,11 +14,19 @@ PKG_SUGGESTED_OPTIONS= bdb ### NOTE: that option is enabled, because the openldap server needs ### to have local storage support to work as standalone. ### - .if !empty(PKG_OPTIONS:Mbdb) -. include "../../databases/db4/buildlink3.mk" +BDB_ACCEPTED= db4 db5 CONFIGURE_ARGS+= --enable-bdb --enable-hdb TEST_TARGET= test +# Fix hard-coded support for db4. +# Remove if fixed in future versions of OpenLDAP. +SUBST_CLASSES= bdb +SUBST_MESSAGE.bdb= Fixing bdb library. +SUBST_STAGE.bdb= pre-configure +SUBST_FILES.bdb= ${WRKSRC}/configure +SUBST_SED.bdb= -e 's,-ldb4,-l${BDB_TYPE},g' +SUBST_SED.bdb+= -e 's,ol_cv_bdb_major = 4,ol_cv_bdb_major > 3,g' +. include "../../mk/bdb.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-bdb --disable-hdb .endif @@ -76,7 +84,6 @@ CONFIGURE_ARGS+= --disable-ipv6 ### ### smbk5pwd support (sync samba and kerberos passwords on password changes) ### - .if !empty(PKG_OPTIONS:Msmbk5pwd) PKG_FAIL_REASON+= "smbk5pwd option to openldap-server is now " \ "available through the openldap-smbk5pwd package" |