diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
index 40687a6a7855..ee47645d3e85 100644
--- a/archivers/zstd/Makefile
+++ b/archivers/zstd/Makefile
@@ -1,69 +1,57 @@
 PORTNAME=	zstd
-DISTVERSION=	1.5.4
+PORTVERSION=	1.5.4
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${DISTVERSION}/
+MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast real-time compression algorithm
 WWW=		https://facebook.github.io/zstd/ \
 		https://github.com/facebook/zstd
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblz4.so:archivers/liblz4
 
 USES=		gmake localbase:ldflags tar:zst
-USE_LDCONFIG=	yes
 
 ALL_TARGET=	default
-TEST_TARGET=	shortest
 BINARY_ALIAS=	gmd5sum=md5sum
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		V=1
+TEST_TARGET=	shortest
+USE_LDCONFIG=	yes
+
+PLIST_SUB=	BUILD_TYPE=${BUILD_TYPE:tl} PORTVERSION=${PORTVERSION}
+SUB_FILES=	zstdConfigVersion.cmake zstdTargets-BUILD_TYPE.cmake
+SUB_LIST=	BUILD_TYPE_CAPS=${BUILD_TYPE:tu} BUILD_TYPE_MIXED=${BUILD_TYPE} PORTVERSION=${PORTVERSION}
 
 .if defined(WITH_DEBUG)
 BUILD_TYPE=     Debug
 .else
 BUILD_TYPE=     Release
 .endif
 
-PLIST_SUB=	DISTVERSION=${DISTVERSION} \
-		BUILD_TYPE=${BUILD_TYPE:tl}
-
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 
 OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
 
 post-build:
-	cd ${BUILD_WRKSRC}/programs && ${DO_MAKE_BUILD} zstd-frugal
+	cd ${WRKSRC}/programs && ${DO_MAKE_BUILD} zstd-frugal
 
 post-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/programs/zstd-frugal ${STAGEDIR}${PREFIX}/bin/zstd-frugal
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/zstd
-	${INSTALL_DATA} ${PATCHDIR}/zstdConfig.cmake.in \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdConfig.cmake
-	${INSTALL_DATA} ${PATCHDIR}/zstdConfigVersion.cmake.in \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdConfigVersion.cmake
-	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdConfigVersion.cmake
-	${INSTALL_DATA} ${PATCHDIR}/zstdTargets-BUILD_TYPE.cmake.in \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets-${BUILD_TYPE:tl}.cmake
-	@${REINPLACE_CMD} -e 's|%%BUILD_TYPE_CAPS%%|${BUILD_TYPE:tu}|g' \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets-${BUILD_TYPE:tl}.cmake
-	@${REINPLACE_CMD} -e 's|%%BUILD_TYPE_MIXED%%|${BUILD_TYPE}|g' \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets-${BUILD_TYPE:tl}.cmake
-	@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets-${BUILD_TYPE:tl}.cmake
-	${INSTALL_DATA} ${PATCHDIR}/zstdTargets.cmake.in \
-		${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets.cmake
-	${RM} ${STAGEDIR}${PREFIX}/lib/cmake/zstd/*.bak
-	${RLN} zstd.1.gz ${STAGEDIR}${PREFIX}/man/man1/zstdmt.1.gz
+	${INSTALL_PROGRAM} ${WRKSRC}/programs/zstd-frugal ${STAGEDIR}${PREFIX}/bin/zstd-frugal
+	${INSTALL_DATA} ${WRKSRC}/build/cmake/zstdConfig.cmake ${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdConfig.cmake
+	${INSTALL_DATA} ${WRKDIR}/zstdConfigVersion.cmake ${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdConfigVersion.cmake
+	${INSTALL_DATA} ${WRKDIR}/zstdTargets-BUILD_TYPE.cmake ${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets-${BUILD_TYPE:tl}.cmake
+	${INSTALL_DATA} ${FILESDIR}/zstdTargets.cmake ${STAGEDIR}${PREFIX}/lib/cmake/zstd/zstdTargets.cmake
+	${LN} -s zstd.1.gz ${STAGEDIR}${PREFIX}/man/man1/zstdmt.1.gz
 
 .include <bsd.port.mk>
diff --git a/archivers/zstd/files/zstdConfig.cmake.in b/archivers/zstd/files/zstdConfig.cmake.in
deleted file mode 100644
index ebbfcc38f6fc..000000000000
--- a/archivers/zstd/files/zstdConfig.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/zstdTargets.cmake")
diff --git a/archivers/zstd/files/zstdConfigVersion.cmake.in b/archivers/zstd/files/zstdConfigVersion.cmake.in
index 9d632415ae6b..74c5c7103a97 100644
--- a/archivers/zstd/files/zstdConfigVersion.cmake.in
+++ b/archivers/zstd/files/zstdConfigVersion.cmake.in
@@ -1,70 +1,70 @@
 # This is a basic version file for the Config-mode of find_package().
 # It is used by write_basic_package_version_file() as input file for configure_file()
 # to create a version-file which can be installed along a config.cmake file.
 #
 # The created file sets PACKAGE_VERSION_EXACT if the current version string and
 # the requested version string are exactly the same and it sets
 # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
 # but only if the requested major version is the same as the current one.
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "%%DISTVERSION%%")
+set(PACKAGE_VERSION "%%PORTVERSION%%")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("%%DISTVERSION%%" MATCHES "^([0-9]+)\\.")
+  if("%%PORTVERSION%%" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "%%DISTVERSION%%")
+    set(CVF_VERSION_MAJOR "%%PORTVERSION%%")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)
     # both endpoints of the range must have the expected major version
     math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
     if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
         OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
           OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
       set(PACKAGE_VERSION_COMPATIBLE FALSE)
     elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
         AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
         OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
       set(PACKAGE_VERSION_COMPATIBLE TRUE)
     else()
       set(PACKAGE_VERSION_COMPATIBLE FALSE)
     endif()
   else()
     if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
       set(PACKAGE_VERSION_COMPATIBLE TRUE)
     else()
       set(PACKAGE_VERSION_COMPATIBLE FALSE)
     endif()
 
     if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
       set(PACKAGE_VERSION_EXACT TRUE)
     endif()
   endif()
 endif()
 
 
 # if the installed project requested no architecture check, don't perform the check
 if("FALSE")
   return()
 endif()
 
 # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
   return()
 endif()
 
 # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
 if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
   math(EXPR installedBits "8 * 8")
   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
   set(PACKAGE_VERSION_UNSUITABLE TRUE)
 endif()
diff --git a/archivers/zstd/files/zstdTargets-BUILD_TYPE.cmake.in b/archivers/zstd/files/zstdTargets-BUILD_TYPE.cmake.in
index fed8503e9e06..72d7b1ba1e73 100644
--- a/archivers/zstd/files/zstdTargets-BUILD_TYPE.cmake.in
+++ b/archivers/zstd/files/zstdTargets-BUILD_TYPE.cmake.in
@@ -1,29 +1,29 @@
 #----------------------------------------------------------------
 # Generated CMake target import file for configuration "%%BUILD_TYPE_MIXED%%".
 #----------------------------------------------------------------
 
 # Commands may need to know the format version.
 set(CMAKE_IMPORT_FILE_VERSION 1)
 
 # Import target "zstd::libzstd_shared" for configuration "%%BUILD_TYPE_MIXED%%"
 set_property(TARGET zstd::libzstd_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS %%BUILD_TYPE_CAPS%%)
 set_target_properties(zstd::libzstd_shared PROPERTIES
-  IMPORTED_LOCATION_%%BUILD_TYPE_CAPS%% "${_IMPORT_PREFIX}/lib/libzstd.so.%%DISTVERSION%%"
+  IMPORTED_LOCATION_%%BUILD_TYPE_CAPS%% "${_IMPORT_PREFIX}/lib/libzstd.so.%%PORTVERSION%%"
   IMPORTED_SONAME_%%BUILD_TYPE_CAPS%% "libzstd.so.1"
   )
 
 list(APPEND _cmake_import_check_targets zstd::libzstd_shared )
-list(APPEND _cmake_import_check_files_for_zstd::libzstd_shared "${_IMPORT_PREFIX}/lib/libzstd.so.%%DISTVERSION%%" )
+list(APPEND _cmake_import_check_files_for_zstd::libzstd_shared "${_IMPORT_PREFIX}/lib/libzstd.so.%%PORTVERSION%%" )
 
 # Import target "zstd::libzstd_static" for configuration "%%BUILD_TYPE_MIXED%%"
 set_property(TARGET zstd::libzstd_static APPEND PROPERTY IMPORTED_CONFIGURATIONS %%BUILD_TYPE_CAPS%%)
 set_target_properties(zstd::libzstd_static PROPERTIES
   IMPORTED_LINK_INTERFACE_LANGUAGES_%%BUILD_TYPE_CAPS%% "C"
   IMPORTED_LOCATION_%%BUILD_TYPE_CAPS%% "${_IMPORT_PREFIX}/lib/libzstd.a"
   )
 
 list(APPEND _cmake_import_check_targets zstd::libzstd_static )
 list(APPEND _cmake_import_check_files_for_zstd::libzstd_static "${_IMPORT_PREFIX}/lib/libzstd.a" )
 
 # Commands beyond this point should not need to know the version.
 set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/archivers/zstd/files/zstdTargets.cmake.in b/archivers/zstd/files/zstdTargets.cmake
similarity index 100%
rename from archivers/zstd/files/zstdTargets.cmake.in
rename to archivers/zstd/files/zstdTargets.cmake
diff --git a/archivers/zstd/pkg-plist b/archivers/zstd/pkg-plist
index c9710e44faab..8898089ce0c3 100644
--- a/archivers/zstd/pkg-plist
+++ b/archivers/zstd/pkg-plist
@@ -1,25 +1,25 @@
 bin/unzstd
 bin/zstd
 bin/zstd-frugal
 bin/zstdcat
 bin/zstdgrep
 bin/zstdless
 bin/zstdmt
 include/zdict.h
 include/zstd.h
 include/zstd_errors.h
 lib/cmake/zstd/zstdConfig.cmake
 lib/cmake/zstd/zstdConfigVersion.cmake
 lib/cmake/zstd/zstdTargets-%%BUILD_TYPE%%.cmake
 lib/cmake/zstd/zstdTargets.cmake
 lib/libzstd.a
 lib/libzstd.so
 lib/libzstd.so.1
-lib/libzstd.so.%%DISTVERSION%%
+lib/libzstd.so.%%PORTVERSION%%
 libdata/pkgconfig/libzstd.pc
 man/man1/unzstd.1.gz
 man/man1/zstd.1.gz
 man/man1/zstdcat.1.gz
 man/man1/zstdgrep.1.gz
 man/man1/zstdless.1.gz
 man/man1/zstdmt.1.gz