pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/ldb ldb: add ldap PKG_OPTION. Otherwise net/...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/749b0c85679c
branches:  trunk
changeset: 413292:749b0c85679c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Mar 18 00:29:38 2020 +0000

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

diffstat:

 databases/ldb/Makefile   |   5 +++--
 databases/ldb/PLIST      |   4 ++--
 databases/ldb/options.mk |  14 ++++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 871c912a331d -r 749b0c85679c databases/ldb/Makefile
--- a/databases/ldb/Makefile    Wed Mar 18 00:26:28 2020 +0000
+++ b/databases/ldb/Makefile    Wed Mar 18 00:29:38 2020 +0000
@@ -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 @@
 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"
diff -r 871c912a331d -r 749b0c85679c databases/ldb/PLIST
--- a/databases/ldb/PLIST       Wed Mar 18 00:26:28 2020 +0000
+++ b/databases/ldb/PLIST       Wed Mar 18 00:29:38 2020 +0000
@@ -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/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}
diff -r 871c912a331d -r 749b0c85679c databases/ldb/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/ldb/options.mk  Wed Mar 18 00:29:38 2020 +0000
@@ -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



Home | Main Index | Thread Index | Old Index