Wed Mar 18 00:29:38 2020 UTC ()
ldb: add ldap PKG_OPTION. Otherwise net/samba4's ldap option can't work.


(tnn)
diff -r1.11 -r1.12 pkgsrc/databases/ldb/Makefile
diff -r1.2 -r1.3 pkgsrc/databases/ldb/PLIST
diff -r0 -r1.1 pkgsrc/databases/ldb/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/databases/ldb/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ldb/Makefile 2020/01/26 17:30:52 1.11
+++ pkgsrc/databases/ldb/Makefile 2020/03/18 00:29:38 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2020/01/26 17:30:52 rillig Exp $ 1# $NetBSD: Makefile,v 1.12 2020/03/18 00:29:38 tnn Exp $
2 2
3# Before updating, make sure net/samba4 supports the newer version. 3# Before updating, make sure net/samba4 supports the newer version.
4DISTNAME= ldb-2.0.8 4DISTNAME= ldb-2.0.8
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= http://www.samba.org/ftp/ldb/ 7MASTER_SITES= http://www.samba.org/ftp/ldb/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://ldb.samba.org/ 10HOMEPAGE= https://ldb.samba.org/
11COMMENT= LDAP-like embedded database 11COMMENT= LDAP-like embedded database
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
@@ -52,23 +52,24 @@ SUBST_FILES.docbook+= buildtools/wafsamb @@ -52,23 +52,24 @@ SUBST_FILES.docbook+= buildtools/wafsamb
52SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py 52SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py
53SUBST_STAGE.docbook= pre-configure 53SUBST_STAGE.docbook= pre-configure
54SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g' 54SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
55 55
56PLIST_VARS+= 64bit 56PLIST_VARS+= 64bit
57.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ 57.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
58 (defined(ABI) && ${ABI} == "64") 58 (defined(ABI) && ${ABI} == "64")
59PLIST.64bit= yes 59PLIST.64bit= yes
60.include "../../databases/lmdb/buildlink3.mk" 60.include "../../databases/lmdb/buildlink3.mk"
61.else 61.else
62CONFIGURE_ARGS+= --without-ldb-lmdb 62CONFIGURE_ARGS+= --without-ldb-lmdb
63.endif 63.endif
64 64
 65.include "options.mk"
 66
65.include "../../converters/libiconv/buildlink3.mk" 67.include "../../converters/libiconv/buildlink3.mk"
66.include "../../databases/openldap-client/buildlink3.mk" 
67.include "../../databases/tdb/buildlink3.mk" 68.include "../../databases/tdb/buildlink3.mk"
68.include "../../devel/cmocka/buildlink3.mk" 69.include "../../devel/cmocka/buildlink3.mk"
69.include "../../devel/popt/buildlink3.mk" 70.include "../../devel/popt/buildlink3.mk"
70.include "../../devel/talloc/buildlink3.mk" 71.include "../../devel/talloc/buildlink3.mk"
71.include "../../devel/tevent/buildlink3.mk" 72.include "../../devel/tevent/buildlink3.mk"
72.include "../../lang/python/application.mk" 73.include "../../lang/python/application.mk"
73.include "../../lang/python/extension.mk" 74.include "../../lang/python/extension.mk"
74.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/databases/ldb/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/ldb/PLIST 2019/11/10 16:58:06 1.2
+++ pkgsrc/databases/ldb/PLIST 2020/03/18 00:29:38 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2019/11/10 16:58:06 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/03/18 00:29:38 tnn Exp $
2bin/ldbadd 2bin/ldbadd
3bin/ldbdel 3bin/ldbdel
4bin/ldbedit 4bin/ldbedit
5bin/ldbmodify 5bin/ldbmodify
6bin/ldbrename 6bin/ldbrename
7bin/ldbsearch 7bin/ldbsearch
8include/ldb.h 8include/ldb.h
9include/ldb_errors.h 9include/ldb_errors.h
10include/ldb_handlers.h 10include/ldb_handlers.h
11include/ldb_module.h 11include/ldb_module.h
12include/ldb_version.h 12include/ldb_version.h
13include/pyldb.h 13include/pyldb.h
14lib/ldb/libldb-cmdline.so 14lib/ldb/libldb-cmdline.so
@@ -24,22 +24,22 @@ lib/libpyldb-util.so.${PKGVERSION} @@ -24,22 +24,22 @@ lib/libpyldb-util.so.${PKGVERSION}
24lib/libpyldb-util.so.2 24lib/libpyldb-util.so.2
25lib/pkgconfig/ldb.pc 25lib/pkgconfig/ldb.pc
26lib/pkgconfig/pyldb-util.pc 26lib/pkgconfig/pyldb-util.pc
27${PYSITELIB}/_ldb_text.py 27${PYSITELIB}/_ldb_text.py
28${PYSITELIB}/ldb.so 28${PYSITELIB}/ldb.so
29man/man1/ldbadd.1 29man/man1/ldbadd.1
30man/man1/ldbdel.1 30man/man1/ldbdel.1
31man/man1/ldbedit.1 31man/man1/ldbedit.1
32man/man1/ldbmodify.1 32man/man1/ldbmodify.1
33man/man1/ldbrename.1 33man/man1/ldbrename.1
34man/man1/ldbsearch.1 34man/man1/ldbsearch.1
35man/man3/ldb.3 35man/man3/ldb.3
36modules/ldb/asq.${SOEXT} 36modules/ldb/asq.${SOEXT}
37modules/ldb/ldap.${SOEXT} 37${PLIST.ldap}modules/ldb/ldap.${SOEXT}
38modules/ldb/ldb.${SOEXT} 38modules/ldb/ldb.${SOEXT}
39${PLIST.64bit}modules/ldb/mdb.${SOEXT} 39${PLIST.64bit}modules/ldb/mdb.${SOEXT}
40modules/ldb/paged_searches.${SOEXT} 40modules/ldb/paged_searches.${SOEXT}
41modules/ldb/rdn_name.${SOEXT} 41modules/ldb/rdn_name.${SOEXT}
42modules/ldb/sample.${SOEXT} 42modules/ldb/sample.${SOEXT}
43modules/ldb/server_sort.${SOEXT} 43modules/ldb/server_sort.${SOEXT}
44modules/ldb/skel.${SOEXT} 44modules/ldb/skel.${SOEXT}
45modules/ldb/tdb.${SOEXT} 45modules/ldb/tdb.${SOEXT}
File Added: pkgsrc/databases/ldb/options.mk
# $NetBSD: options.mk,v 1.1 2020/03/18 00:29:38 tnn Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.ldb
PKG_SUPPORTED_OPTIONS=	ldap
PKG_SUGGESTED_OPTIONS=	ldap

.include "../../mk/bsd.options.mk"

PLIST_VARS+=		ldap

.if !empty(PKG_OPTIONS:Mldap)
.  include "../../databases/openldap-client/buildlink3.mk"
PLIST.ldap=		yes
.endif