Index: head/databases/leveldb/Makefile
===================================================================
--- head/databases/leveldb/Makefile	(revision 499393)
+++ head/databases/leveldb/Makefile	(revision 499394)
@@ -1,71 +1,48 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	leveldb
-PORTVERSION=	1.20
-DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTVERSION=	1.21
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast and lightweight key/value database library by Google
 
 LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	GPERFTOOLS SNAPPY
 OPTIONS_DEFAULT=SNAPPY
 
-CONFIGURE_ARGS=	build_config.mk ${WRKSRC}/
-CONFIGURE_SCRIPT=	build_detect_platform
-HAS_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-TEST_TARGET=	check
+USES=		cmake compiler:c++11-lang localbase
+
+CMAKE_OFF=	LEVELDB_BUILD_TESTS
+CMAKE_ON=	BUILD_SHARED_LIBS LEVELDB_BUILD_BENCHMARKS LEVELDB_INSTALL
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
-USES=		compiler:c++0x gmake localbase
 
 PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR} \
 		SHLIB_MINOR=${SHLIB_MINOR}
 
 SHLIB_MAJOR=	${PORTVERSION:R}
 SHLIB_MINOR=	${PORTVERSION:E}
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+SNAPPY_VARS=		SNAPPY=1 SNAPPY_CFLAGS=-DSNAPPY
+SNAPPY_VARS_OFF=	SNAPPY=0 SNAPPY_CFLAGS=
 
 post-patch:
-	@${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h
+	@${REINPLACE_CMD} -e 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|; s|%%SHLIB_MINOR%%|${SHLIB_MINOR}|' ${WRKSRC}/CMakeLists.txt
 
-post-patch-GPERFTOOLS-off:
-	@${REINPLACE_CMD} -e 's| -ltcmalloc||' ${WRKSRC}/build_detect_platform
-
-post-patch-SNAPPY-off:
-	@${REINPLACE_CMD} -e 's| -DSNAPPY||; s| -lsnappy||' ${WRKSRC}/build_detect_platform
-
+post-install:
+	${AR} cq ${STAGEDIR}${PREFIX}/lib/libleveldb.a ${BUILD_WRKSRC}/CMakeFiles/leveldb.dir/*/*.o
 # backward compatibility (for databases/p5-Tie-LevelDB)
-pre-install-SNAPPY-off:
-	${ECHO_CMD} "SNAPPY=0" >> ${WRKSRC}/build_config.mk
-
-pre-install-SNAPPY-on:
-	${ECHO_CMD} "SNAPPY=1" >> ${WRKSRC}/build_config.mk
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/leveldb/ ${STAGEDIR}${PREFIX}/include/memenv/ ${STAGEDIR}${DATADIR}/
-	${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${STAGEDIR}${PREFIX}/include/leveldb/
-	${INSTALL_DATA} ${WRKSRC}/helpers/memenv/memenv.h ${STAGEDIR}${PREFIX}/include/memenv/
-	${INSTALL_LIB} ${WRKSRC}/out-shared/libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/out-shared/libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/out-static/libleveldb.a ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_DATA} ${WRKSRC}/out-static/libmemenv.a ${STAGEDIR}${PREFIX}/lib/
-	${LN} -fs libleveldb.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so
-	${LN} -fs libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR}
-	${LN} -fs libmemenv.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so
-	${LN} -fs libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libmemenv.so.${SHLIB_MAJOR}
-# backward compatibility (for databases/p5-Tie-LevelDB)
-	${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PORT_CFLAGS|' >> ${WRKSRC}/build_config.mk
-	${GREP} '^PLATFORM_CXXFLAGS=' ${WRKSRC}/build_config.mk | ${SED} 's|PLATFORM_CXXFLAGS|PLATFORM_CFLAGS|' >> ${WRKSRC}/build_config.mk
-	${INSTALL_DATA} ${WRKSRC}/build_config.mk ${STAGEDIR}${DATADIR}/
+	${MKDIR} ${STAGEDIR}${DATADIR}/
+	${ECHO_CMD} "PLATFORM_CFLAGS=-std=c++11 -D_REENTRANT -DOS_FREEBSD -DLEVELDB_PLATFORM_POSIX ${SNAPPY_CFLAGS}" > ${STAGEDIR}${DATADIR}/build_config.mk
+	${ECHO_CMD} "PORT_CFLAGS=-std=c++11 -D_REENTRANT -DOS_FREEBSD -DLEVELDB_PLATFORM_POSIX ${SNAPPY_CFLAGS}" >> ${STAGEDIR}${DATADIR}/build_config.mk
+	${ECHO_CMD} "SNAPPY=${SNAPPY}" >> ${STAGEDIR}${DATADIR}/build_config.mk
 
 .include <bsd.port.mk>
Index: head/databases/leveldb/distinfo
===================================================================
--- head/databases/leveldb/distinfo	(revision 499393)
+++ head/databases/leveldb/distinfo	(revision 499394)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488462981
-SHA256 (google-leveldb-v1.20_GH0.tar.gz) = f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664
-SIZE (google-leveldb-v1.20_GH0.tar.gz) = 223141
+TIMESTAMP = 1553965140
+SHA256 (google-leveldb-1.21_GH0.tar.gz) = e0fbd238047b9e82ec26a2b808f826b60e12b4fcb5d1a18c7b3d6edf357b4026
+SIZE (google-leveldb-1.21_GH0.tar.gz) = 236979
Index: head/databases/leveldb/files/patch-build_detect_platform
===================================================================
--- head/databases/leveldb/files/patch-build_detect_platform	(revision 499393)
+++ head/databases/leveldb/files/patch-build_detect_platform	(nonexistent)
@@ -1,11 +0,0 @@
---- build_detect_platform.orig	2017-03-02 00:08:02 UTC
-+++ build_detect_platform
-@@ -224,7 +224,7 @@ EOF
-     rm -f $CXXOUTPUT 2>/dev/null
- 
-     # Test if gcc SSE 4.2 is supported
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null  <<EOF
-+    $CXX $CXXFLAGS -x c++ -Werror - -o $CXXOUTPUT -msse4.2 2>/dev/null  <<EOF
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then

Property changes on: head/databases/leveldb/files/patch-build_detect_platform
___________________________________________________________________
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/leveldb/files/patch-Makefile
===================================================================
--- head/databases/leveldb/files/patch-Makefile	(revision 499393)
+++ head/databases/leveldb/files/patch-Makefile	(nonexistent)
@@ -1,36 +0,0 @@
---- Makefile.orig	2017-03-02 00:08:02 UTC
-+++ Makefile
-@@ -15,8 +15,7 @@ OPT ?= -O2 -DNDEBUG
- #-----------------------------------------------
- 
- # detect what platform we're building on
--$(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \
--    ./build_detect_platform build_config.mk ./)
-+# $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" ./build_detect_platform build_config.mk ./)
- # this file is generated by the previous line to set build flags and sources
- include build_config.mk
- 
-@@ -126,12 +125,12 @@ SHARED_VERSION_MINOR = 20
- SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
- SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
--SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
-+SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3) $(SHARED_MEMENVLIB)
- $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
- 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
- $(SHARED_OUTDIR)/$(SHARED_LIB2): $(SHARED_OUTDIR)/$(SHARED_LIB3)
- 	ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB2)
--SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.a
-+SHARED_MEMENVLIB = $(SHARED_OUTDIR)/libmemenv.$(PLATFORM_SHARED_EXT).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
- endif
- 
- $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
-@@ -294,7 +293,7 @@ endif
- 
- $(SHARED_MEMENVLIB):$(SHARED_MEMENVOBJECTS)
- 	rm -f $@
--	$(AR) -rs $@ $(SHARED_MEMENVOBJECTS)
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(basename $(notdir $(SHARED_MEMENVLIB))) $(SHARED_MEMENVOBJECTS) -o $(SHARED_MEMENVLIB) $(LIBS)
- 
- $(STATIC_OUTDIR)/db_bench:db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL)
- 	$(CXX) $(LDFLAGS) $(CXXFLAGS) db/db_bench.cc $(STATIC_LIBOBJECTS) $(TESTUTIL) -o $@ $(LIBS)

Property changes on: head/databases/leveldb/files/patch-Makefile
___________________________________________________________________
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/leveldb/files/patch-CMakeLists.txt
===================================================================
--- head/databases/leveldb/files/patch-CMakeLists.txt	(nonexistent)
+++ head/databases/leveldb/files/patch-CMakeLists.txt	(revision 499394)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2019-03-29 21:37:39 UTC
++++ CMakeLists.txt
+@@ -228,6 +228,11 @@ if (NOT HAVE_CXX17_HAS_INCLUDE)
+ endif(NOT HAVE_CXX17_HAS_INCLUDE)
+ 
+ if(BUILD_SHARED_LIBS)
++  set_target_properties(leveldb
++    PROPERTIES
++      VERSION %%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
++      SOVERSION %%SHLIB_MAJOR%%
++  )
+   target_compile_definitions(leveldb
+     PUBLIC
+       # Used by include/export.h.

Property changes on: head/databases/leveldb/files/patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/databases/leveldb/pkg-plist
===================================================================
--- head/databases/leveldb/pkg-plist	(revision 499393)
+++ head/databases/leveldb/pkg-plist	(revision 499394)
@@ -1,24 +1,24 @@
 include/leveldb/c.h
 include/leveldb/cache.h
 include/leveldb/comparator.h
 include/leveldb/db.h
 include/leveldb/dumpfile.h
 include/leveldb/env.h
+include/leveldb/export.h
 include/leveldb/filter_policy.h
 include/leveldb/iterator.h
 include/leveldb/options.h
 include/leveldb/slice.h
 include/leveldb/status.h
 include/leveldb/table.h
 include/leveldb/table_builder.h
 include/leveldb/write_batch.h
-include/memenv/memenv.h
+lib/cmake/leveldb/leveldbConfig.cmake
+lib/cmake/leveldb/leveldbConfigVersion.cmake
+lib/cmake/leveldb/leveldbTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/leveldb/leveldbTargets.cmake
 lib/libleveldb.a
 lib/libleveldb.so
 lib/libleveldb.so.%%SHLIB_MAJOR%%
 lib/libleveldb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-lib/libmemenv.a
-lib/libmemenv.so
-lib/libmemenv.so.%%SHLIB_MAJOR%%
-lib/libmemenv.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%DATADIR%%/build_config.mk