Tue Mar 6 15:20:27 2018 UTC ()
kyotocabinet: Fix compilation with gcc-6.

'false' is not a valid char *.


(wiz)
diff -r1.5 -r1.6 pkgsrc/databases/kyotocabinet/distinfo
diff -r0 -r1.1 pkgsrc/databases/kyotocabinet/patches/patch-kcdbext.h
cvs diff -r1.5 -r1.6 pkgsrc/databases/kyotocabinet/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/kyotocabinet/distinfo 2015/11/03 01:56:13 1.5
+++ pkgsrc/databases/kyotocabinet/distinfo 2018/03/06 15:20:27 1.6
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 01:56:13 agc Exp $ 1$NetBSD: distinfo,v 1.6 2018/03/06 15:20:27 wiz Exp $
2 2
3SHA1 (kyotocabinet-1.2.76.tar.gz) = a4ec70d08ca6c8f510dbc329d5c27b55030d3521 3SHA1 (kyotocabinet-1.2.76.tar.gz) = a4ec70d08ca6c8f510dbc329d5c27b55030d3521
4RMD160 (kyotocabinet-1.2.76.tar.gz) = 3bc2feb6e01310764c422cc93d9a98ced1da2cfb 4RMD160 (kyotocabinet-1.2.76.tar.gz) = 3bc2feb6e01310764c422cc93d9a98ced1da2cfb
5SHA512 (kyotocabinet-1.2.76.tar.gz) = 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a 5SHA512 (kyotocabinet-1.2.76.tar.gz) = 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a
6Size (kyotocabinet-1.2.76.tar.gz) = 951930 bytes 6Size (kyotocabinet-1.2.76.tar.gz) = 951930 bytes
7SHA1 (patch-configure) = 67f2a01332236f7db88a5714ced8662b1c82a467 7SHA1 (patch-configure) = 67f2a01332236f7db88a5714ced8662b1c82a467
8SHA1 (patch-kccommon.h) = 93a4c003aa6bf069cf65f2a943314f2a332790c6 8SHA1 (patch-kccommon.h) = 93a4c003aa6bf069cf65f2a943314f2a332790c6
 9SHA1 (patch-kcdbext.h) = 0e0bbb820742a1e0a6ecb4a171862b1a841f01de
9SHA1 (patch-kcthread.cc) = d09d280cd9589b10bbc10b29dc51d40ce074cc7f 10SHA1 (patch-kcthread.cc) = d09d280cd9589b10bbc10b29dc51d40ce074cc7f
File Added: pkgsrc/databases/kyotocabinet/patches/Attic/patch-kcdbext.h
$NetBSD: patch-kcdbext.h,v 1.1 2018/03/06 15:20:27 wiz Exp $

Fix compilation with gcc-6. 'false' is not a valid char *.

--- kcdbext.h.orig	2012-05-24 16:27:59.000000000 +0000
+++ kcdbext.h
@@ -1278,7 +1278,7 @@ class IndexDB {
     if (omode_ == 0) {
       set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
       *sp = 0;
-      return false;
+      return NULL;
     }
     if (!cache_) return db_.get(kbuf, ksiz, sp);
     size_t dvsiz = 0;