- Update to 4.0

Changes:	https://github.com/facebook/rocksdb/releases

6 files changed, 9 insertions, 60 deletions

diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index e3fe986d9287..0f884043e061 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	3.13.1
-DISTVERSIONPREFIX=	rocksdb-
+PORTVERSION=	4.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -17,6 +17,7 @@ LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags \
 
 ALL_TARGET=	shared_lib all
 CPPFLAGS+=	-DOS_FREEBSD
+MAKE_ENV=	CXX=${CXX}
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 USES=		compiler:c++11-lib gmake localbase
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 7674a352b37b..5a6381a12fad 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (facebook-rocksdb-rocksdb-3.13.1_GH0.tar.gz) = 163eb917b6ba5ef405d25087946341415ca01f0f1ef42e2bb4bd419b073ec386
-SIZE (facebook-rocksdb-rocksdb-3.13.1_GH0.tar.gz) = 1782062
+SHA256 (facebook-rocksdb-v4.0_GH0.tar.gz) = 4447d780d2f7ab1e9ad0a1b7515bb321c7b87744017ae041ee67d468ce6e7e5d
+SIZE (facebook-rocksdb-v4.0_GH0.tar.gz) = 1838039
diff --git a/databases/rocksdb/files/patch-tools-db_stress.cc b/databases/rocksdb/files/patch-tools-db_stress.cc
deleted file mode 100644
index 7a9c3b1b1543..000000000000
--- a/databases/rocksdb/files/patch-tools-db_stress.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-Obtained from:	https://github.com/facebook/rocksdb/commit/4b0b0201c9abb7675413ce25e5044b1c9a8853c8
-
---- tools/db_stress.cc.orig	2015-08-31 18:23:39 UTC
-+++ tools/db_stress.cc
-@@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0,
- DEFINE_int32(set_in_place_one_in, 0,
-              "With a chance of 1/N, toggle in place support option");
- 
--DEFINE_int64(cache_size, 2 * KB * KB * KB,
-+DEFINE_int64(cache_size, 2LL * KB * KB * KB,
-              "Number of bytes to use as a cache of uncompressed data.");
- 
- static bool ValidateInt32Positive(const char* flagname, int32_t value) {
diff --git a/databases/rocksdb/files/patch-util-sst_dump_tool.cc b/databases/rocksdb/files/patch-util-sst_dump_tool.cc
deleted file mode 100644
index 393cd8b9f705..000000000000
--- a/databases/rocksdb/files/patch-util-sst_dump_tool.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Obtained from:	https://github.com/facebook/rocksdb/commit/90415cfebe90bda845b9ee3e5a00e86d4f80e02e
-
---- util/sst_dump_tool.cc.orig	2015-08-31 18:23:39 UTC
-+++ util/sst_dump_tool.cc
-@@ -12,6 +12,7 @@
- #endif
- 
- #include <inttypes.h>
-+#include "port/port.h"
- 
- namespace rocksdb {
- 
-@@ -164,7 +165,7 @@ int SstFileReader::ShowAllCompressionSiz
-   compress_type.insert(
-       std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression"));
- 
--  fprintf(stdout, "Block Size: %lu\n", block_size);
-+  fprintf(stdout, "Block Size: %" ROCKSDB_PRIszt "\n", block_size);
- 
-   for (CompressionType i = CompressionType::kNoCompression;
-        i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) {
diff --git a/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc b/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc
deleted file mode 100644
index 5383729fb94b..000000000000
--- a/databases/rocksdb/files/patch-utilities-checkpoint-checkpoint.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-Obtained from:	https://github.com/facebook/rocksdb/commit/f171faa240ccd12ac05d54b7ea0a8c29d2f1d9d6
-
---- utilities/checkpoint/checkpoint.cc.orig	2015-08-31 18:23:39 UTC
-+++ utilities/checkpoint/checkpoint.cc
-@@ -24,6 +24,7 @@
- #include "rocksdb/env.h"
- #include "rocksdb/transaction_log.h"
- #include "util/file_util.h"
-+#include "port/port.h"
- 
- namespace rocksdb {
- 
-@@ -131,7 +132,7 @@ Status CheckpointImpl::CreateCheckpoint(
-                    (type == kDescriptorFile) ? manifest_file_size : 0);
-     }
-   }
--  Log(db_->GetOptions().info_log, "Number of log files %ld",
-+  Log(db_->GetOptions().info_log, "Number of log files %" ROCKSDB_PRIszt,
-       live_wal_files.size());
- 
-   // Link WAL files. Copy exact size of last one because it is the only one
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 686e5f1fbe4b..a90cff4e7d91 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -31,6 +31,7 @@ include/rocksdb/perf_level.h
 include/rocksdb/rate_limiter.h
 include/rocksdb/slice.h
 include/rocksdb/slice_transform.h
+include/rocksdb/snapshot.h
 include/rocksdb/sst_dump_tool.h
 include/rocksdb/statistics.h
 include/rocksdb/status.h
@@ -50,11 +51,13 @@ include/rocksdb/utilities/geo_db.h
 include/rocksdb/utilities/info_log_finder.h
 include/rocksdb/utilities/json_document.h
 include/rocksdb/utilities/leveldb_options.h
-include/rocksdb/utilities/optimistic_transaction.h
 include/rocksdb/utilities/optimistic_transaction_db.h
 include/rocksdb/utilities/spatial_db.h
 include/rocksdb/utilities/stackable_db.h
 include/rocksdb/utilities/table_properties_collectors.h
+include/rocksdb/utilities/transaction.h
+include/rocksdb/utilities/transaction_db.h
+include/rocksdb/utilities/transaction_db_mutex.h
 include/rocksdb/utilities/utility_db.h
 include/rocksdb/utilities/write_batch_with_index.h
 include/rocksdb/version.h