4 files changed, 34 insertions, 31 deletions

diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 2d69b9a65700..f93799922959 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	5.0.2
-PORTREVISION=	1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	5.2.1
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	databases
 
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Persistent key-value store for fast storage environments
+MAINTAINER?=	sunpoet@FreeBSD.org
+COMMENT?=	Persistent key-value store for fast storage environments
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libsnappy.so:archivers/snappy
 
@@ -26,15 +26,15 @@ 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_ENV=	PORTABLE=0 ROCKSDB_ROOT=${WRKSRC}
 CONFIGURE_SCRIPT=	build_tools/build_detect_platform
 CPPFLAGS+=	-DOS_FREEBSD
+HAS_CONFIGURE=	yes
 MAKE_ENV=	CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX}
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
-USES=		compiler:c++11-lib gmake localbase:ldflags
+USES=		compiler:c++11-lib gmake localbase:ldflags shebangfix
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_MAJOR=${PORTVERSION:R:R} SHLIB_MINOR=${PORTVERSION:R:E}
 PORTDATA=	make_config.mk
@@ -42,6 +42,8 @@ PORTDATA=	make_config.mk
 GH_ACCOUNT=	facebook
 USE_GITHUB=	yes
 
+SHEBANG_FILES=	*/*.sh
+
 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
 
@@ -50,6 +52,17 @@ DEBUG_MAKE_ENV_OFF=	DEBUG_LEVEL=0
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
+.if !defined(LITE)
+CONFLICTS_INSTALL=	rocksdb-lite-
+PLIST_SUB+=	LITE=""
+.else
+PKGNAMESUFFIX=	-lite
+CONFLICTS_INSTALL=	rocksdb-[0-9]*
+CPPFLAGS+=	-DROCKSDB_LITE=1
+MAKE_ENV+=	LIBNAME=librocksdb${PKGNAMESUFFIX}
+PLIST_SUB+=	LITE=${PKGNAMESUFFIX}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
@@ -61,7 +74,7 @@ CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||; /^dummy :=/d' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^dummy :=/d; /^all: / s| $$(TESTS)||' ${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)
@@ -81,8 +94,8 @@ post-patch-ZSTD-off:
 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/
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb${PKGNAMESUFFIX}.so
+	${INSTALL_DATA} ${WRKSRC}/librocksdb${PKGNAMESUFFIX}_tools.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/
 
 regression-test test: build
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 952cad34008d..4a14523f7bd6 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484836129
-SHA256 (facebook-rocksdb-v5.0.2_GH0.tar.gz) = 5e39d2131ebdb92c30eda3d32861f489f4843fad50cc2fbd5d234bc4415948ca
-SIZE (facebook-rocksdb-v5.0.2_GH0.tar.gz) = 2925364
+TIMESTAMP = 1491631638
+SHA256 (facebook-rocksdb-rocksdb-5.2.1_GH0.tar.gz) = 13b19d6527e2f2f12712b7356b9df09c5edfe7c8a7e984d935bcebe5342847ac
+SIZE (facebook-rocksdb-rocksdb-5.2.1_GH0.tar.gz) = 3194021
diff --git a/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc b/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc
deleted file mode 100644
index c03fb7e0bed8..000000000000
--- a/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- utilities/column_aware_encoding_exp.cc.orig	2016-12-09 20:59:51 UTC
-+++ utilities/column_aware_encoding_exp.cc
-@@ -8,6 +8,7 @@
- #endif
- 
- #include <cstdio>
-+#include <cstdlib>
- 
- #ifndef ROCKSDB_LITE
- #ifdef GFLAGS
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 377a4b9c5938..7eb9fa9ea2c7 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -60,7 +60,6 @@ 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
@@ -71,6 +70,7 @@ 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/object_registry.h
 include/rocksdb/utilities/optimistic_transaction_db.h
 include/rocksdb/utilities/option_change_migration.h
 include/rocksdb/utilities/options_util.h
@@ -88,9 +88,9 @@ 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.%%SHLIB_MAJOR%%
-lib/librocksdb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-lib/librocksdb.so.%%PORTVERSION%%
-lib/librocksdb_tools.a
+lib/librocksdb%%LITE%%.a
+lib/librocksdb%%LITE%%.so
+lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%%
+lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+lib/librocksdb%%LITE%%.so.%%PORTVERSION%%
+lib/librocksdb%%LITE%%_tools.a