svn commit: r385269 - in branches/2015Q2/databases/rocksdb: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun May  3 13:28:25 2015
New Revision: 385269
URL: https://svnweb.freebsd.org/changeset/ports/385269

Log:
  MFH: r383473
  
  - Update to 3.10
  
  Changes:	https://github.com/facebook/rocksdb/releases
  
  Approved by:	ports-secteam (zi)

Deleted:
  branches/2015Q2/databases/rocksdb/files/patch-util-log_buffer.h
Modified:
  branches/2015Q2/databases/rocksdb/Makefile
  branches/2015Q2/databases/rocksdb/distinfo
  branches/2015Q2/databases/rocksdb/pkg-plist
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/databases/rocksdb/Makefile
==============================================================================
--- branches/2015Q2/databases/rocksdb/Makefile	Sun May  3 13:28:04 2015	(r385268)
+++ branches/2015Q2/databases/rocksdb/Makefile	Sun May  3 13:28:25 2015	(r385269)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rocksdb
-PORTVERSION=	3.9.1
+PORTVERSION=	3.10
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet at FreeBSD.org
@@ -22,15 +22,19 @@ USES=		compiler:c++11-lib gmake
 
 GH_ACCOUNT=	facebook
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
+GH_TAGNAME=	v${PORTVERSION}
 USE_GITHUB=	yes
 
-PROGRAMS=	blob_store_bench 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 log_and_apply_bench signal_test sst_dump table_reader_bench
+
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
+CXXFLAGS+=	-Wno-inconsistent-missing-override
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||; s| -Werror||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's| -fno-builtin-memcmp||; s| -ltcmalloc||' ${WRKSRC}/build_tools/build_detect_platform
 	@${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h
 .if defined(WITHOUT_PROFILE)
@@ -44,9 +48,9 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/librocksdb.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/librocksdb.so ${STAGEDIR}${PREFIX}/lib/librocksdb.so.0
 	${LN} -fs librocksdb.so.0 ${STAGEDIR}${PREFIX}/lib/librocksdb.so
-	${INSTALL_DATA} ${WRKSRC}/build_config.mk ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/
 
 regression-test test: build
 	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: branches/2015Q2/databases/rocksdb/distinfo
==============================================================================
--- branches/2015Q2/databases/rocksdb/distinfo	Sun May  3 13:28:04 2015	(r385268)
+++ branches/2015Q2/databases/rocksdb/distinfo	Sun May  3 13:28:25 2015	(r385269)
@@ -1,2 +1,2 @@
-SHA256 (facebook-rocksdb-3.9.1-rocksdb-3.9.1_GH0.tar.gz) = 6228ca0fcec486b03233fc5824bd955c8a749ab45d0481630bba2da7fdeba634
-SIZE (facebook-rocksdb-3.9.1-rocksdb-3.9.1_GH0.tar.gz) = 1275843
+SHA256 (facebook-rocksdb-3.10-v3.10_GH0.tar.gz) = 69014675eb1bd517c21ef92eac067cf3ac010ee6103bffccec11ceb771c4f7b7
+SIZE (facebook-rocksdb-3.10-v3.10_GH0.tar.gz) = 1601600

Modified: branches/2015Q2/databases/rocksdb/pkg-plist
==============================================================================
--- branches/2015Q2/databases/rocksdb/pkg-plist	Sun May  3 13:28:04 2015	(r385268)
+++ branches/2015Q2/databases/rocksdb/pkg-plist	Sun May  3 13:28:25 2015	(r385269)
@@ -1,4 +1,3 @@
-bin/blob_store_bench
 bin/db_bench
 bin/db_repl_stress
 bin/db_sanity_test
@@ -34,6 +33,7 @@ include/rocksdb/statistics.h
 include/rocksdb/status.h
 include/rocksdb/table.h
 include/rocksdb/table_properties.h
+include/rocksdb/thread_status.h
 include/rocksdb/transaction_log.h
 include/rocksdb/types.h
 include/rocksdb/universal_compaction.h
@@ -51,7 +51,8 @@ include/rocksdb/utilities/utility_db.h
 include/rocksdb/utilities/write_batch_with_index.h
 include/rocksdb/version.h
 include/rocksdb/write_batch.h
+include/rocksdb/write_batch_base.h
 lib/librocksdb.a
 lib/librocksdb.so
 lib/librocksdb.so.0
-%%DATADIR%%/build_config.mk
+%%DATADIR%%/make_config.mk