diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile
index 19220a612e46..c73f1013018e 100644
--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@@ -1,46 +1,40 @@
 PORTNAME=	leveldb
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast and lightweight key/value database library by Google
 WWW=		https://github.com/google/leveldb
 
 LICENSE=	BSD3CLAUSE
 
 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
 
-PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR} \
-		SHLIB_MINOR=${SHLIB_MINOR}
-
-SHLIB_MAJOR=	${PORTVERSION:R}
-SHLIB_MINOR=	${PORTVERSION:E}
+PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R}
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	GPERFTOOLS SNAPPY
 OPTIONS_DEFAULT=SNAPPY
 
 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 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|; s|%%SHLIB_MINOR%%|${SHLIB_MINOR}|' ${WRKSRC}/CMakeLists.txt
-
 post-install:
 	${AR} cq ${STAGEDIR}${PREFIX}/lib/libleveldb.a ${BUILD_WRKSRC}/CMakeFiles/leveldb.dir/*/*.o
 # backward compatibility (for databases/p5-Tie-LevelDB)
 	${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>
diff --git a/databases/leveldb/files/patch-CMakeLists.txt b/databases/leveldb/files/patch-CMakeLists.txt
deleted file mode 100644
index f4c15a9c4f26..000000000000
--- a/databases/leveldb/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.
diff --git a/databases/leveldb/pkg-plist b/databases/leveldb/pkg-plist
index 69dde5e2f7ab..37bbd042e2ed 100644
--- a/databases/leveldb/pkg-plist
+++ b/databases/leveldb/pkg-plist
@@ -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
 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/libleveldb.so.%%SHLIB_VER%%
+lib/libleveldb.so.%%PORTVERSION%%.0
 %%DATADIR%%/build_config.mk