CVS commit: pkgsrc/databases/ldb

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Mar 18 00:29:38 UTC 2020

Modified Files:
        pkgsrc/databases/ldb: Makefile PLIST
Added Files:
        pkgsrc/databases/ldb: options.mk

Log Message:
ldb: add ldap PKG_OPTION. Otherwise net/samba4's ldap option can't work.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/ldb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/ldb/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/ldb/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/ldb/Makefile
diff -u pkgsrc/databases/ldb/Makefile:1.11 pkgsrc/databases/ldb/Makefile:1.12
--- pkgsrc/databases/ldb/Makefile:1.11  Sun Jan 26 17:30:52 2020
+++ pkgsrc/databases/ldb/Makefile       Wed Mar 18 00:29:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/26 17:30:52 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/18 00:29:38 tnn Exp $
 
 # Before updating, make sure net/samba4 supports the newer version.
 DISTNAME=      ldb-2.0.8
@@ -62,8 +62,9 @@ PLIST.64bit=          yes
 CONFIGURE_ARGS+=       --without-ldb-lmdb
 .endif
 
+.include "options.mk"
+
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../databases/tdb/buildlink3.mk"
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"

Index: pkgsrc/databases/ldb/PLIST
diff -u pkgsrc/databases/ldb/PLIST:1.2 pkgsrc/databases/ldb/PLIST:1.3
--- pkgsrc/databases/ldb/PLIST:1.2      Sun Nov 10 16:58:06 2019
+++ pkgsrc/databases/ldb/PLIST  Wed Mar 18 00:29:38 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/11/10 16:58:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/03/18 00:29:38 tnn Exp $
 bin/ldbadd
 bin/ldbdel
 bin/ldbedit
@@ -34,7 +34,7 @@ man/man1/ldbrename.1
 man/man1/ldbsearch.1
 man/man3/ldb.3
 modules/ldb/asq.${SOEXT}
-modules/ldb/ldap.${SOEXT}
+${PLIST.ldap}modules/ldb/ldap.${SOEXT}
 modules/ldb/ldb.${SOEXT}
 ${PLIST.64bit}modules/ldb/mdb.${SOEXT}
 modules/ldb/paged_searches.${SOEXT}

Added files:

Index: pkgsrc/databases/ldb/options.mk
diff -u /dev/null pkgsrc/databases/ldb/options.mk:1.1
--- /dev/null   Wed Mar 18 00:29:38 2020
+++ pkgsrc/databases/ldb/options.mk     Wed Mar 18 00:29:38 2020
@@ -0,0 +1,14 @@
+# $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