Update to kyotocabinet-1.2.77.

Drop patch as issue had been addressed upstream. While here switch
HOMEPAGE to https.

OK sthen@
This commit is contained in:
bket 2019-01-02 16:03:54 +00:00
parent b8657e8faf
commit 3c269fd052
4 changed files with 12 additions and 28 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:59 sthen Exp $
# $OpenBSD: Makefile,v 1.22 2019/01/02 16:03:54 bket Exp $
BROKEN-hppa= undefined reference to __sync_fetch_and_add_8
BROKEN-powerpc= undefined reference to __sync_fetch_and_add_8
@ -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/

View File

@ -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

View File

@ -1,11 +1,12 @@
$OpenBSD: patch-configure,v 1.1.1.1 2012/08/29 14:32:51 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.2 2019/01/02 16:03:54 bket Exp $
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

View File

@ -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;