pkgsrc-Changes archive

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

CVS commit: pkgsrc/databases/ldb



Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon May 18 15:39:20 UTC 2020

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

Log Message:
Unbreak building without ldap support - the library got built and
installed, anyway, resulting in a PLIST error.

ldb's snazzy little build system has no official configuration option
for this, so we reach in and flick the switch by hand.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/ldb/Makefile
cvs rdiff -u -r1.1 -r1.2 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.14 pkgsrc/databases/ldb/Makefile:1.15
--- pkgsrc/databases/ldb/Makefile:1.14  Wed Apr 29 10:00:12 2020
+++ pkgsrc/databases/ldb/Makefile       Mon May 18 15:39:20 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/04/29 10:00:12 adam Exp $
+# $NetBSD: Makefile,v 1.15 2020/05/18 15:39:20 hauke Exp $
 
 # Before updating, make sure net/samba4 supports the newer version.
 DISTNAME=      ldb-2.1.2
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://www.samba.org/ftp/ldb/
 

Index: pkgsrc/databases/ldb/options.mk
diff -u pkgsrc/databases/ldb/options.mk:1.1 pkgsrc/databases/ldb/options.mk:1.2
--- pkgsrc/databases/ldb/options.mk:1.1 Wed Mar 18 00:29:38 2020
+++ pkgsrc/databases/ldb/options.mk     Mon May 18 15:39:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/03/18 00:29:38 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2020/05/18 15:39:20 hauke Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ldb
 PKG_SUPPORTED_OPTIONS= ldap
@@ -11,4 +11,11 @@ PLIST_VARS+=         ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 PLIST.ldap=            yes
+.else
+# No official way to configure without ldap
+CFG_CACHE=     ${WRKSRC}/bin/c4che/default_cache.py
+post-configure:
+       mv ${CFG_CACHE} ${CFG_CACHE}.orig
+       sed -E -e 's/(ENABLE_LDAP_BACKEND =) True/\1 False/g' \
+               ${CFG_CACHE}.orig > ${CFG_CACHE}
 .endif



Home | Main Index | Thread Index | Old Index