[Midnightbsd-cvs] mports [23760] trunk/databases/leveldb: update leveldb to 1.20

[laffer1 at midnightbsd.org]

Revision: 23760
          http://svnweb.midnightbsd.org/mports/?rev=23760
Author:   laffer1
Date:     2018-08-18 17:50:42 -0400 (Sat, 18 Aug 2018)
Log Message:
-----------
update leveldb to 1.20

Modified Paths:
--------------
    trunk/databases/leveldb/Makefile
    trunk/databases/leveldb/distinfo
    trunk/databases/leveldb/files/patch-Makefile

Modified: trunk/databases/leveldb/Makefile
===================================================================
--- trunk/databases/leveldb/Makefile	2018-08-18 21:49:02 UTC (rev 23759)
+++ trunk/databases/leveldb/Makefile	2018-08-18 21:50:42 UTC (rev 23760)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	leveldb
-PORTVERSION=	1.18
+PORTVERSION=	1.20
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	databases

Modified: trunk/databases/leveldb/distinfo
===================================================================
--- trunk/databases/leveldb/distinfo	2018-08-18 21:49:02 UTC (rev 23759)
+++ trunk/databases/leveldb/distinfo	2018-08-18 21:50:42 UTC (rev 23760)
@@ -1,2 +1,3 @@
-SHA256 (google-leveldb-v1.18_GH0.tar.gz) = 4aa1a7479bc567b95a59ac6fb79eba49f61884d6fd400f20b7af147d54c5cee5
-SIZE (google-leveldb-v1.18_GH0.tar.gz) = 209376
+TIMESTAMP = 1534628990
+SHA256 (leveldb-v1.20_GH0.tar.gz) = f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664
+SIZE (leveldb-v1.20_GH0.tar.gz) = 223141

Modified: trunk/databases/leveldb/files/patch-Makefile
===================================================================
--- trunk/databases/leveldb/files/patch-Makefile	2018-08-18 21:49:02 UTC (rev 23759)
+++ trunk/databases/leveldb/files/patch-Makefile	2018-08-18 21:50:42 UTC (rev 23760)
@@ -1,25 +1,36 @@
---- Makefile.orig	2014-09-16 21:19:52 UTC
+--- Makefile.orig	2017-03-02 00:08:02 UTC
 +++ Makefile
-@@ -95,9 +95,21 @@ endif
- $(SHARED3):
- 	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
+@@ -15,8 +15,7 @@ OPT ?= -O2 -DNDEBUG
+ #-----------------------------------------------
  
-+SHARED += $(MEMENVLIBRARY_SHARED1) $(MEMENVLIBRARY_SHARED2) $(MEMENVLIBRARY_SHARED3)
-+MEMENVLIBRARY_SHARED1 = libmemenv.$(PLATFORM_SHARED_EXT)
-+MEMENVLIBRARY_SHARED2 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR)
-+MEMENVLIBRARY_SHARED3 = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR)
-+MEMENVLIBRARY_SHARED = libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_MAJOR).$(SHARED_MINOR)
-+$(MEMENVLIBRARY_SHARED1): $(MEMENVLIBRARY_SHARED3)
-+	ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED1)
-+$(MEMENVLIBRARY_SHARED2): $(MEMENVLIBRARY_SHARED3)
-+	ln -fs $(MEMENVLIBRARY_SHARED3) $(MEMENVLIBRARY_SHARED2)
-+$(MEMENVLIBRARY_SHARED3):
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(MEMENVLIBRARY_SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(MEMENV_SOURCES) -o $(MEMENVLIBRARY_SHARED) $(LIBS)
-+
- endif  # PLATFORM_SHARED_EXT
+ # detect what platform we're building on
+-$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
+-    ./build_detect_platform build_config.mk ./)
++# $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" ./build_detect_platform build_config.mk ./)
+ # this file is generated by the previous line to set build flags and sources
+ include build_config.mk
  
--all: $(SHARED) $(LIBRARY)
-+all: $(SHARED) $(LIBRARY) $(MEMENVLIBRARY)
+@@ -126,12 +125,12 @@ SHARED_VERSION_MINOR = 20
+ SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
+ SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
+ SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
+-SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
++SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB)
+ $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
+ $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
+ 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
+-SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
++SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
+ endif
  
- check: all $(PROGRAMS) $(TESTS)
- 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
+ $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
+@@ -294,7 +293,7 @@ endif
+ 
+ $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS)
+ 	rm -f $@
+-	$(AR) -rs $@ $(SHARED_MEMENVOBJECTS)
++	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS)
+ 
+ $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL)
+ 	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)