diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile
index d00726e36fec..018e73febdff 100644
--- a/devel/cmake-core/Makefile
+++ b/devel/cmake-core/Makefile
@@ -1,103 +1,103 @@
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
 DISTVERSION=	${_CMAKE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-core
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross-platform Makefile generator
 WWW=		https://www.cmake.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libjsoncpp.so:devel/jsoncpp \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
 USES=		cmake:_internal compiler:c++11-lang cpe localbase ncurses ssl
 
 CPE_VENDOR=	cmake_project
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=make
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--datadir="/${DATADIR_REL}" \
 		--docdir="/${DOCSDIR_REL}" \
 		--system-expat \
 		--system-jsoncpp \
 		--system-zlib \
 		--system-zstd \
 		--system-bzip2 \
 		--system-liblzma \
 		--system-libarchive \
 		--system-librhash \
 		--system-libuv \
 		--no-system-curl \
 		--no-system-nghttp2 \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${WRKSRC}/InitialCache.cmake"
 
 OPTIONS_DEFINE=	DOCS CPACK
 OPTIONS_DEFAULT=	CPACK
 OPTIONS_SUB=	yes
 
 CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
 CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
 
 CXXFLAGS+=	-D__BSD_VISIBLE
 
 .include <bsd.port.pre.mk>
 
 .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET=	install/strip
 .endif
 
 # Before running configure, substitute in the values of options
 # for the build. CMake's configure doesn't accept --with-foo
 # or similar options: it expects them to be set in CMake-style
 # syntax in the initial cache.
 pre-configure:
 	@${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake"
 
 pre-configure-CPACK-on:
 	@${REINPLACE_CMD} \
 		-e 's/@@CPACK_OPTION_VALUE@@/ON/' \
 		-e 's/@@CPACK_OPTION_COMMENT@@//' \
 		"${WRKSRC}/InitialCache.cmake"
 
 pre-configure-CPACK-off:
 	@${REINPLACE_CMD} \
 		-e 's/@@CPACK_OPTION_VALUE@@/OFF/' \
 		-e 's/@@CPACK_OPTION_COMMENT@@/# /' \
 		"${WRKSRC}/InitialCache.cmake"
 
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
 		${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \
 			s,/usr/X11R6,${LOCALBASE},g'
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${WRKSRC}/Source/cmLocalGenerator.cxx \
 		${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
 		${WRKSRC}/bootstrap
 	@${REINPLACE_CMD} -e 's,/opt/kde4,${PREFIX},g' \
 		${WRKSRC}/Modules/FindKDE4.cmake
 	@${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \
 		${WRKSRC}/Modules/FindDCMTK.cmake
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Modules/FindFLEX.cmake
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete
 
 # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to
 # prevent it from being built/installed by devel/cmake.
 	${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 	# The .NoDartCoverage is supposed to suppress testing in the
 	# source directories, but gets accidentally installed.
 	@${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete
 
 .include <bsd.port.post.mk>
diff --git a/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff b/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff
new file mode 100644
index 000000000000..8047db8d925e
--- /dev/null
+++ b/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff
@@ -0,0 +1,47 @@
+diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
+index d0deb8778d0143c9d9b7dfe6d7ff1b40ff2056da..4e7d5d665aae8730cd74fc35c1763afe5b6a0397 100644
+--- Modules/FindZLIB.cmake
++++ Modules/FindZLIB.cmake
+@@ -175,25 +175,24 @@ unset(ZLIB_NAMES_DEBUG)
+ mark_as_advanced(ZLIB_INCLUDE_DIR)
+ 
+ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
+-    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
+-
+-    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
+-    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
+-    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
+-    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
+-
+-    # only append a TWEAK version if it exists:
++  file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
++  if(ZLIB_H MATCHES "ZLIB_VERSION \"(([0-9]+)\\.([0-9]+)(\\.([0-9]+)(\\.([0-9]+))?)?)")
++    set(ZLIB_VERSION_STRING "${CMAKE_MATCH_1}")
++    set(ZLIB_VERSION_MAJOR "${CMAKE_MATCH_2}")
++    set(ZLIB_VERSION_MINOR "${CMAKE_MATCH_3}")
++    set(ZLIB_VERSION_PATCH "${CMAKE_MATCH_5}")
++    set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_7}")
++  else()
++    set(ZLIB_VERSION_STRING "")
++    set(ZLIB_VERSION_MAJOR "")
++    set(ZLIB_VERSION_MINOR "")
++    set(ZLIB_VERSION_PATCH "")
+     set(ZLIB_VERSION_TWEAK "")
+-    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
+-        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
+-        string(APPEND ZLIB_VERSION_STRING ".${ZLIB_VERSION_TWEAK}")
+-    endif()
+-
+-    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
+-    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
+-    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
+-
+-    set(ZLIB_VERSION ${ZLIB_VERSION_STRING})
++  endif()
++  set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
++  set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
++  set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
++  set(ZLIB_VERSION "${ZLIB_VERSION_STRING}")
+ endif()
+ 
+ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)