CVS commit: pkgsrc/databases/lmdb

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec 20 17:55:24 UTC 2018

Modified Files:
        pkgsrc/databases/lmdb: Makefile distinfo
        pkgsrc/databases/lmdb/patches: patch-libraries_liblmdb_Makefile
Removed Files:
        pkgsrc/databases/lmdb/patches: patch-libraries_liblmdb_mdb.c

Log Message:
lmdb: updated to 0.9.23

LMDB 0.9.23:
Fix loose pages in dirty list
Fix mdb_load flag init
Fix mdb_env_close in forked process
Documentation
 mdb_cursor_del doesn't invalidate cursor
 GET_MULTIPLE etc don't change passed in key


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/lmdb/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/lmdb/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_mdb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/lmdb/Makefile
diff -u pkgsrc/databases/lmdb/Makefile:1.7 pkgsrc/databases/lmdb/Makefile:1.8
--- pkgsrc/databases/lmdb/Makefile:1.7  Sun Dec  9 03:04:34 2018
+++ pkgsrc/databases/lmdb/Makefile      Thu Dec 20 17:55:24 2018
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.7 2018/12/09 03:04:34 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/20 17:55:24 adam Exp $
 
-DISTNAME=      LMDB-0.9.18
-PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
+.include "../../databases/openldap/Makefile.version"
+
+# get the version from libraries/liblmdb/lmdb.h
+PKGNAME=       lmdb-0.9.23
 CATEGORIES=    databases
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=LMDB/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://symas.com/mdb/
 COMMENT=       Symas Lightning Memory-Mapped Database
-LICENSE=       modified-bsd
-
-GITHUB_PROJECT=        ${PKGBASE}
-GITHUB_TAG=    ${DISTNAME:S/-/_/}
-WRKSRC=                ${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
 
 USE_GCC_RUNTIME=       yes
 USE_TOOLS+=            gmake
 
 BUILD_DIRS=            libraries/liblmdb
-MAKE_FLAGS+=           XCFLAGS=-D_SEM_SEMUN_UNDEFINED
+MAKE_FLAGS+=           CC=${CC:Q}
+MAKE_FLAGS+=           XCFLAGS=${CFLAGS:Q}\ -D_SEM_SEMUN_UNDEFINED
 INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}
 
 INSTALLATION_DIRS+=    bin
@@ -27,5 +22,13 @@ INSTALLATION_DIRS+=  include
 INSTALLATION_DIRS+=    lib
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
+TEST_TARGET=           test
+
+.include "../../mk/bsd.prefs.mk"
+.if "${OPSYS}" == "Darwin"
+MAKE_FLAGS+=           SOEXT=.dylib
+MAKE_FLAGS+=           SOLIBS=-install_name\ ${PREFIX}/lib/liblmdb.dylib
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/lmdb/distinfo
diff -u pkgsrc/databases/lmdb/distinfo:1.5 pkgsrc/databases/lmdb/distinfo:1.6
--- pkgsrc/databases/lmdb/distinfo:1.5  Fri Nov 25 15:50:13 2016
+++ pkgsrc/databases/lmdb/distinfo      Thu Dec 20 17:55:24 2018
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2016/11/25 15:50:13 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2018/12/20 17:55:24 adam Exp $
 
-SHA1 (LMDB-0.9.18.tar.gz) = 375e31bd0a4d8426e5fc4bfdb00d532c206d4f2b
-RMD160 (LMDB-0.9.18.tar.gz) = 498e2076e9c3e1145d14d83880a54430f20875d8
-SHA512 (LMDB-0.9.18.tar.gz) = 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6
-Size (LMDB-0.9.18.tar.gz) = 139156 bytes
-SHA1 (patch-libraries_liblmdb_Makefile) = da5288510ae26b498e1cf8ed453bb1c74f25e54a
-SHA1 (patch-libraries_liblmdb_mdb.c) = 26d1dd1e59b30f8e814bcc3a5d2ff9fd449f83ab
+SHA1 (openldap-2.4.47.tgz) = c59d52dd75f7d1c7b02f83725da36c322d439674
+RMD160 (openldap-2.4.47.tgz) = c228e5d55019c90aaeceeda32980e52cd7a0a4a6
+SHA512 (openldap-2.4.47.tgz) = d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11
+Size (openldap-2.4.47.tgz) = 5699678 bytes
+SHA1 (patch-libraries_liblmdb_Makefile) = 6b2f0bb477b17b073095d499ff4496f3b30dc08f

Index: pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile
diff -u pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.3 pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.4
--- pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile:1.3  Fri Nov 25 15:50:13 2016
+++ pkgsrc/databases/lmdb/patches/patch-libraries_liblmdb_Makefile      Thu Dec 20 17:55:24 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-libraries_liblmdb_Makefile,v 1.3 2016/11/25 15:50:13 fhajny Exp $
+$NetBSD: patch-libraries_liblmdb_Makefile,v 1.4 2018/12/20 17:55:24 adam Exp $
 
 Use proper install commands.
 
---- libraries/liblmdb/Makefile.orig    2016-02-06 06:22:15.000000000 +0900
-+++ libraries/liblmdb/Makefile 2016-02-16 21:08:37.000000000 +0900
-@@ -48,10 +48,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+--- libraries/liblmdb/Makefile.orig    2018-12-19 15:57:06.000000000 +0000
++++ libraries/liblmdb/Makefile
+@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
        mkdir -p $(DESTDIR)$(libdir)
        mkdir -p $(DESTDIR)$(includedir)
        mkdir -p $(DESTDIR)$(mandir)/man1
@@ -19,3 +19,22 @@ Use proper install commands.
  
  clean:
        rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
+@@ -68,10 +68,14 @@ liblmdb$(SOEXT):   mdb.lo midl.lo
+ #     $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
+       $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
+ 
+-mdb_stat: mdb_stat.o liblmdb.a
+-mdb_copy: mdb_copy.o liblmdb.a
+-mdb_dump: mdb_dump.o liblmdb.a
+-mdb_load: mdb_load.o liblmdb.a
++mdb_stat: mdb_stat.o liblmdb${SOEXT}
++      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++mdb_copy: mdb_copy.o liblmdb${SOEXT}
++      $(CC) $(LDFLAGS) -L. -Wl,-R.  -llmdb -o $@ $<
++mdb_dump: mdb_dump.o liblmdb${SOEXT}
++      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
++mdb_load: mdb_load.o liblmdb${SOEXT}
++      $(CC) $(LDFLAGS) -L. -Wl,-R. -llmdb -o $@ $<
+ mtest:    mtest.o    liblmdb.a
+ mtest2:       mtest2.o liblmdb.a
+ mtest3:       mtest3.o liblmdb.a