Index: head/databases/rocksdb/Makefile =================================================================== --- head/databases/rocksdb/Makefile (revision 430882) +++ head/databases/rocksdb/Makefile (revision 430883) @@ -1,89 +1,90 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 4.13.5 +PORTVERSION= 5.0.1 DISTVERSIONPREFIX= v CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= Persistent key-value store for fast storage environments LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgflags.so:devel/gflags \ libsnappy.so:archivers/snappy BROKEN_DragonFly= does not build on DragonFly BSD using GCC with -Werror BROKEN_aarch64= does not build: the clang compiler does not support -march=native BROKEN_armv6= does not build: the clang compiler does not support -march=native BROKEN_powerpc64= does not build BROKEN_sparc64= cannot build: uses unknown compiler flags OPTIONS_DEFINE= DEBUG LZ4 ZSTD OPTIONS_DEFAULT=LZ4 ALL_TARGET= shared_lib static_lib all HAS_CONFIGURE= yes CONFIGURE_ARGS= make_config.mk CONFIGURE_ENV= ROCKSDB_ROOT=${WRKSRC} CONFIGURE_SCRIPT= build_tools/build_detect_platform CPPFLAGS+= -DOS_FREEBSD MAKE_ENV= CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_CXXSTD= c++11 USE_LDCONFIG= yes USES= compiler:c++11-lib gmake localbase:ldflags +PLIST_SUB= PORTVERSION=${PORTVERSION} SHLIB_MAJOR=${PORTVERSION:R:R} SHLIB_MINOR=${PORTVERSION:R:E} PORTDATA= make_config.mk GH_ACCOUNT= facebook USE_GITHUB= yes BENCHMARKS= cache_bench column_aware_encoding_exp db_bench memtablerep_bench persistent_cache_bench table_reader_bench TOOLS= db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump write_stress DEBUG_MAKE_ENV= DEBUG_LEVEL=2 DEBUG_MAKE_ENV_OFF= DEBUG_LEVEL=0 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 CXXFLAGS+= -Wno-inconsistent-missing-override .endif .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 60 CFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: @${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||; /^dummy :=/d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's| -fno-builtin-memcmp||; s| -ltcmalloc||' ${WRKSRC}/build_tools/build_detect_platform @${REINPLACE_CMD} -e 's|#include "gtest/gtest.h"|#include "gtest.h"|' ${WRKSRC}/third-party/gtest-1.7.0/fused-src/gtest/gtest-all.cc .if defined(WITHOUT_PROFILE) @${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile .endif # Disable SSE4.2 on i386 architecture to fix i386 builds on FreeBSD package building cluster .if ${ARCH} == i386 @${REINPLACE_CMD} -e 's|#ifdef __SSE4_2__|&DISABLED__|' ${WRKSRC}/util/crc32c.cc .endif post-patch-LZ4-off: @${REINPLACE_CMD} -e '/lz4/Id' ${WRKSRC}/build_tools/build_detect_platform post-patch-ZSTD-off: @${REINPLACE_CMD} -e '/zstd/Id' ${WRKSRC}/build_tools/build_detect_platform post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so ${INSTALL_DATA} ${WRKSRC}/librocksdb_tools.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/databases/rocksdb/distinfo =================================================================== --- head/databases/rocksdb/distinfo (revision 430882) +++ head/databases/rocksdb/distinfo (revision 430883) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482334174 -SHA256 (facebook-rocksdb-v4.13.5_GH0.tar.gz) = 3384655107f59a6ee9a52a54d0631d9ae96c722e411bafe6c4547ec4fc201534 -SIZE (facebook-rocksdb-v4.13.5_GH0.tar.gz) = 2884076 +TIMESTAMP = 1483809793 +SHA256 (facebook-rocksdb-v5.0.1_GH0.tar.gz) = a47c6ed3bbc80c3564bf77aa9c482cec2d35cec20693d48354722e6b3051324e +SIZE (facebook-rocksdb-v5.0.1_GH0.tar.gz) = 2924923 Index: head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc =================================================================== --- head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc (revision 430882) +++ head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc (nonexistent) @@ -1,16 +0,0 @@ -Obtained from: https://github.com/facebook/rocksdb/commit/85bd8f518b55782f2fada586eabc953df15478e1 - ---- utilities/persistent_cache/persistent_cache_bench.cc.orig 2016-12-09 20:59:51 UTC -+++ utilities/persistent_cache/persistent_cache_bench.cc -@@ -302,9 +302,9 @@ class CacheTierBenchmark { - // main - // - int main(int argc, char** argv) { -- google::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + -+ GFLAGS::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + - " [OPTIONS]..."); -- google::ParseCommandLineFlags(&argc, &argv, false); -+ GFLAGS::ParseCommandLineFlags(&argc, &argv, false); - - std::ostringstream msg; - msg << "Config" << std::endl Property changes on: head/databases/rocksdb/files/patch-utilities-persistent_cache-persistent_cache_bench.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc =================================================================== --- head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc (revision 430882) +++ head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc (nonexistent) @@ -1,16 +0,0 @@ -Obtained from: https://github.com/facebook/rocksdb/commit/85bd8f518b55782f2fada586eabc953df15478e1 - ---- utilities/persistent_cache/hash_table_bench.cc.orig 2016-12-09 20:59:51 UTC -+++ utilities/persistent_cache/hash_table_bench.cc -@@ -272,9 +272,9 @@ class GranularLockImpl : public HashTabl - // main - // - int main(int argc, char** argv) { -- google::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + -+ GFLAGS::SetUsageMessage(std::string("\nUSAGE:\n") + std::string(argv[0]) + - " [OPTIONS]..."); -- google::ParseCommandLineFlags(&argc, &argv, false); -+ GFLAGS::ParseCommandLineFlags(&argc, &argv, false); - - // - // Micro benchmark unordered_map Property changes on: head/databases/rocksdb/files/patch-utilities-persistent_cache-hash_table_bench.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/rocksdb/pkg-plist =================================================================== --- head/databases/rocksdb/pkg-plist (revision 430882) +++ head/databases/rocksdb/pkg-plist (revision 430883) @@ -1,93 +1,96 @@ bin/cache_bench bin/column_aware_encoding_exp bin/db_bench bin/db_repl_stress bin/db_sanity_test bin/db_stress bin/ldb bin/memtablerep_bench bin/persistent_cache_bench bin/rocksdb_dump bin/rocksdb_undump bin/sst_dump bin/table_reader_bench bin/write_stress include/rocksdb/c.h include/rocksdb/cache.h include/rocksdb/compaction_filter.h include/rocksdb/compaction_job_stats.h include/rocksdb/comparator.h include/rocksdb/convenience.h include/rocksdb/db.h include/rocksdb/db_bench_tool.h include/rocksdb/db_dump_tool.h include/rocksdb/env.h include/rocksdb/experimental.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h include/rocksdb/iostats_context.h include/rocksdb/iterator.h include/rocksdb/ldb_tool.h include/rocksdb/listener.h include/rocksdb/memtablerep.h include/rocksdb/merge_operator.h include/rocksdb/metadata.h include/rocksdb/options.h include/rocksdb/perf_context.h include/rocksdb/perf_level.h include/rocksdb/persistent_cache.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/sst_file_manager.h include/rocksdb/sst_file_writer.h include/rocksdb/statistics.h include/rocksdb/status.h include/rocksdb/table.h include/rocksdb/table_properties.h include/rocksdb/thread_status.h include/rocksdb/threadpool.h include/rocksdb/transaction_log.h include/rocksdb/types.h include/rocksdb/universal_compaction.h include/rocksdb/utilities/backupable_db.h include/rocksdb/utilities/checkpoint.h include/rocksdb/utilities/convenience.h include/rocksdb/utilities/date_tiered_db.h include/rocksdb/utilities/db_ttl.h include/rocksdb/utilities/document_db.h include/rocksdb/utilities/env_librados.h include/rocksdb/utilities/env_mirror.h include/rocksdb/utilities/env_registry.h include/rocksdb/utilities/geo_db.h include/rocksdb/utilities/info_log_finder.h include/rocksdb/utilities/json_document.h include/rocksdb/utilities/ldb_cmd.h include/rocksdb/utilities/ldb_cmd_execute_result.h include/rocksdb/utilities/leveldb_options.h +include/rocksdb/utilities/lua/rocks_lua_compaction_filter.h +include/rocksdb/utilities/lua/rocks_lua_custom_library.h +include/rocksdb/utilities/lua/rocks_lua_util.h include/rocksdb/utilities/memory_util.h include/rocksdb/utilities/optimistic_transaction_db.h include/rocksdb/utilities/option_change_migration.h include/rocksdb/utilities/options_util.h include/rocksdb/utilities/sim_cache.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 include/rocksdb/wal_filter.h include/rocksdb/write_batch.h include/rocksdb/write_batch_base.h include/rocksdb/write_buffer_manager.h lib/librocksdb.a lib/librocksdb.so -lib/librocksdb.so.4 -lib/librocksdb.so.4.13 -lib/librocksdb.so.4.13.5 +lib/librocksdb.so.%%SHLIB_MAJOR%% +lib/librocksdb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%% +lib/librocksdb.so.%%PORTVERSION%% lib/librocksdb_tools.a