kyotocabinet received an update to 1.2.77. Changelog only states "Fixed
build errors". Manual comparison of 1.2.77 with 1.2.76 indicates that
some fixes have been applied, and that no new features have been added.

Build and run tested with its only customer: neomutt. 'make test' still
fails [0]:

FAILED: KCRNDSEED=3219882074 PID=76922 ./kchashtest wicked -bnum 5000 -msiz 
50000 casket 10000

One patch has been dropped as it has been addressed upstream.

While here:
- switch HOMEPAGE to https
- update WANTLIB

OK?


[0] https://marc.info/?l=openbsd-ports&m=134625833104229&w=2


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/kyotocabinet/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile    24 Oct 2018 14:27:59 -0000      1.21
+++ Makefile    18 Dec 2018 06:10:57 -0000
@@ -8,19 +8,18 @@ NOT_FOR_ARCHS=                ${GCC3_ARCHS}
 
 COMMENT=       straightforward implementation of DBM
 
-DISTNAME=      kyotocabinet-1.2.76
-REVISION=      2
+DISTNAME=      kyotocabinet-1.2.77
 
 SHARED_LIBS += kyotocabinet 0.0 # 16.0
 
 CATEGORIES=    databases
 
-HOMEPAGE=      http://fallabs.com/kyotocabinet/
+HOMEPAGE=      https://fallabs.com/kyotocabinet/
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c m pthread ${COMPILER_LIBCXX} z
+WANTLIB +=     ${COMPILER_LIBCXX} c m z
 
 MASTER_SITES=  ${HOMEPAGE}pkg/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/kyotocabinet/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    29 Aug 2012 14:32:51 -0000      1.1.1.1
+++ distinfo    18 Dec 2018 06:10:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (kyotocabinet-1.2.76.tar.gz) = 
gSotPynDUdtMbx/ynZTXE1+eYB18wYcuwdfu04HQ0jw=
-SIZE (kyotocabinet-1.2.76.tar.gz) = 951930
+SHA256 (kyotocabinet-1.2.77.tar.gz) = 
VomTKThMxvDx+Ko/G0EAEHHKmcHXkiUIan81dcAgneY=
+SIZE (kyotocabinet-1.2.77.tar.gz) = 949326
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/databases/kyotocabinet/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure     29 Aug 2012 14:32:51 -0000      1.1.1.1
+++ patches/patch-configure     18 Dec 2018 06:10:57 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-configure,v 1.1.1.1 2012
 Put our CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS at the end so that we can
 override optimisations...
 
---- configure.orig     Thu May 24 13:31:45 2012
-+++ configure  Wed Aug 29 08:56:20 2012
-@@ -3352,10 +3352,10 @@ $as_echo "$as_me: WARNING: another compiler except for
+Index: configure
+--- configure.orig
++++ configure
+@@ -3381,10 +3381,10 @@ $as_echo "$as_me: WARNING: another compiler except for
    MYCFLAGS=""
    MYCXXFLAGS=""
  fi
@@ -20,7 +21,7 @@ override optimisations...
  
  # Byte order
  
-@@ -4554,9 +4554,7 @@ then
+@@ -4583,9 +4583,7 @@ then
      MYLIBRARYFILES="$MYLIBRARYFILES libkyotocabinet.dylib"
      MYLDLIBPATHENV="DYLD_LIBRARY_PATH"
    else
Index: patches/patch-kcdbext_h
===================================================================
RCS file: patches/patch-kcdbext_h
diff -N patches/patch-kcdbext_h
--- patches/patch-kcdbext_h     8 Apr 2018 13:10:25 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-kcdbext_h,v 1.1 2018/04/08 13:10:25 jasper Exp $
-
-error: cannot initialize return object of type 'char *' with an rvalue of type 
'bool'
-
-Index: kcdbext.h
---- kcdbext.h.orig
-+++ 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;

Reply via email to