diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile index 64ac16833c83..f8c954f78eaa 100644 --- a/archivers/zstd/Makefile +++ b/archivers/zstd/Makefile @@ -1,50 +1,50 @@ PORTNAME= zstd -PORTVERSION= 1.5.6 +PORTVERSION= 1.5.7 CATEGORIES= archivers 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 ALL_TARGET= default BINARY_ALIAS= gmd5sum=md5sum CFLAGS+= -fPIC MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_MAN="${INSTALL_MAN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ MANDIR=${PREFIX}/share/man \ V=1 -TEST_TARGET= shortest +TEST_TARGET= check 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} BUILD_TYPE= ${defined(WITH_DEBUG) :?Debug:Release} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_VARS= CFLAGS+=-O3 post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/zstd ${INSTALL_DATA} ${FILESDIR}/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}/share/man/man1/zstdmt.1.gz .include diff --git a/archivers/zstd/distinfo b/archivers/zstd/distinfo index 46a55033cd34..06fcc91f806d 100644 --- a/archivers/zstd/distinfo +++ b/archivers/zstd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711540146 -SHA256 (zstd-1.5.6.tar.zst) = 4aa8dd1c1115c0fd6b6b66c35c7f6ce7bd58cc1dfd3e4f175b45b39e84b14352 -SIZE (zstd-1.5.6.tar.zst) = 1845516 +TIMESTAMP = 1740022434 +SHA256 (zstd-1.5.7.tar.zst) = 5b331d961d6989dc21bb03397fc7a2a4d86bc65a14adc5ffbbce050354e30fd2 +SIZE (zstd-1.5.7.tar.zst) = 1862563 diff --git a/archivers/zstd/files/zstdConfigVersion.cmake.in b/archivers/zstd/files/zstdConfigVersion.cmake.in index 4528f77accac..aca8084b9b16 100644 --- a/archivers/zstd/files/zstdConfigVersion.cmake.in +++ b/archivers/zstd/files/zstdConfigVersion.cmake.in @@ -1,65 +1,52 @@ # 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 "%%PORTVERSION%%") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() 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 "%%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 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()