- Update to 3.11

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

6 files changed, 25 insertions, 34 deletions

diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 94d964029bf9..791187d49a68 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	3.10.2
+PORTVERSION=	3.11
 DISTVERSIONPREFIX=	rocksdb-
 CATEGORIES=	databases
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags \
 		libsnappy.so:${PORTSDIR}/archivers/snappy
 
 ALL_TARGET=	shared_lib all
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${WRKSRC}/include -I${LOCALBASE}/include
 CPPFLAGS+=	-DOS_FREEBSD
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_CXXSTD=	c++11
@@ -25,7 +25,7 @@ USES=		compiler:c++11-lib gmake
 GH_ACCOUNT=	facebook
 USE_GITHUB=	yes
 
-PROGRAMS=	db_bench db_repl_stress db_sanity_test db_stress ldb log_and_apply_bench signal_test sst_dump table_reader_bench
+PROGRAMS=	db_bench db_repl_stress db_sanity_test db_stress ldb sst_dump table_reader_bench
 
 .include <bsd.port.pre.mk>
 
@@ -33,9 +33,12 @@ PROGRAMS=	db_bench db_repl_stress db_sanity_test db_stress ldb log_and_apply_ben
 CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
+.if ${COMPILER_TYPE} == clang
+#CXXFLAGS+=	-Wno-shift-count-overflow
+.if ${COMPILER_VERSION} >= 36
 CXXFLAGS+=	-Wno-inconsistent-missing-override
 .endif
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile
@@ -43,6 +46,9 @@ post-patch:
 .if defined(WITHOUT_PROFILE)
 	@${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile
 .endif
+.if !defined(MACHINE_CPU:Msse42)
+#	@${REINPLACE_CMD} -e 's| -msse4.2||' ${WRKSRC}/build_tools/build_detect_platform
+.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/rocksdb/ ${STAGEDIR}${DATADIR}/
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 8c5f482bc2e2..883b5cff904e 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (facebook-rocksdb-rocksdb-3.10.2_GH0.tar.gz) = 5ace408b12e5e5c836c9ba0b1bd57662784d15820cd02b203459b3ac2e01fde7
-SIZE (facebook-rocksdb-rocksdb-3.10.2_GH0.tar.gz) = 1602427
+SHA256 (facebook-rocksdb-rocksdb-3.11_GH0.tar.gz) = 84ddbcbecc956aacc947d1109d79624e972fb7042fc48a8b3481f04566bc2e36
+SIZE (facebook-rocksdb-rocksdb-3.11_GH0.tar.gz) = 1639978
diff --git a/databases/rocksdb/files/patch-db_memtablerep__bench.cc b/databases/rocksdb/files/patch-db_memtablerep__bench.cc
deleted file mode 100644
index 42dc71309c78..000000000000
--- a/databases/rocksdb/files/patch-db_memtablerep__bench.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- db/memtablerep_bench.cc.orig	2015-03-25 21:40:41 UTC
-+++ db/memtablerep_bench.cc
-@@ -132,7 +132,7 @@ DEFINE_int64(seed, 0,
-              "Seed base for random number generators. "
-              "When 0 it is deterministic.");
- 
--static rocksdb::Env* FLAGS_env = rocksdb::Env::Default();
-+//static rocksdb::Env* FLAGS_env = rocksdb::Env::Default();
- 
- namespace rocksdb {
- 
diff --git a/databases/rocksdb/files/patch-util-logging.cc b/databases/rocksdb/files/patch-util-logging.cc
deleted file mode 100644
index 7124a942d287..000000000000
--- a/databases/rocksdb/files/patch-util-logging.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- util/logging.cc.orig	2015-03-25 21:40:41 UTC
-+++ util/logging.cc
-@@ -35,10 +35,10 @@ int AppendHumanMicros(uint64_t micros, c
-   } else if (micros < 10000000) {
-     return snprintf(output, len, "%.3lf ms",
-                     static_cast<double>(micros) / 1000);
--  } else if (micros < 1000000l * 60) {
-+  } else if (micros < 1000000LL * 60) {
-     return snprintf(output, len, "%.3lf sec",
-                     static_cast<double>(micros) / 1000000);
--  } else if (micros < 1000000l * 60 * 60) {
-+  } else if (micros < 1000000LL * 60 * 60) {
-     return snprintf(output, len, "%02" PRIu64 ":%05.3f M:S",
-         micros / 1000000 / 60,
-         static_cast<double>(micros % 60000000) / 1000000);
diff --git a/databases/rocksdb/files/patch-util-thread_status_impl.cc b/databases/rocksdb/files/patch-util-thread_status_impl.cc
new file mode 100644
index 000000000000..49c3888c8d05
--- /dev/null
+++ b/databases/rocksdb/files/patch-util-thread_status_impl.cc
@@ -0,0 +1,11 @@
+--- util/thread_status_impl.cc.orig	2015-05-20 01:42:17 UTC
++++ util/thread_status_impl.cc
+@@ -100,7 +100,7 @@ std::map<std::string, uint64_t>
+       property_map.insert(
+           {"BaseInputLevel", op_properties[i] >> 32});
+       property_map.insert(
+-          {"OutputLevel", op_properties[i] % (1LU << 32)});
++          {"OutputLevel", op_properties[i] % ((uint64_t) 1LU << 32)});
+     } else if (op_type == OP_COMPACTION &&
+                i == COMPACTION_PROP_FLAGS) {
+       property_map.insert(
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 004d44d9cd8b..8a6be5f028cd 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -3,8 +3,6 @@ bin/db_repl_stress
 bin/db_sanity_test
 bin/db_stress
 bin/ldb
-bin/log_and_apply_bench
-bin/signal_test
 bin/sst_dump
 bin/table_reader_bench
 include/rocksdb/c.h
@@ -13,6 +11,7 @@ include/rocksdb/compaction_filter.h
 include/rocksdb/comparator.h
 include/rocksdb/db.h
 include/rocksdb/env.h
+include/rocksdb/experimental.h
 include/rocksdb/filter_policy.h
 include/rocksdb/flush_block_policy.h
 include/rocksdb/immutable_options.h
@@ -42,6 +41,7 @@ include/rocksdb/utilities/checkpoint.h
 include/rocksdb/utilities/convenience.h
 include/rocksdb/utilities/db_ttl.h
 include/rocksdb/utilities/document_db.h
+include/rocksdb/utilities/flashcache.h
 include/rocksdb/utilities/geo_db.h
 include/rocksdb/utilities/json_document.h
 include/rocksdb/utilities/leveldb_options.h