Date: Sun, 9 Apr 2023 13:39:40 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 57d2530c89ce - main - archivers/zstd: Clean up 72ad532057c9f9fb6fa370c80f663c005e9dd021 Message-ID: <202304091339.339Ddeiq081018@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=57d2530c89ce5793e987becf91f2a2463fa53522 commit 57d2530c89ce5793e987becf91f2a2463fa53522 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-04-09 13:29:39 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-04-09 13:36:32 +0000 archivers/zstd: Clean up 72ad532057c9f9fb6fa370c80f663c005e9dd021 - Use WRKSRC instead of BUILD_WRKSRC - Use SUB_FILES/SUB_LIST instead of a bunch of REINPLACE_CMD - Use FILESDIR instead of PATCHDIR - Clean up files/*: - Remove unnecessary file: zstdConfig.cmake is already in the source tarball - Rename patch file: Remove unnecessary .in suffix --- archivers/zstd/Makefile | 42 ++++++++-------------- archivers/zstd/files/zstdConfig.cmake.in | 1 - archivers/zstd/files/zstdConfigVersion.cmake.in | 6 ++-- .../zstd/files/zstdTargets-BUILD_TYPE.cmake.in | 4 +-- .../{zstdTargets.cmake.in => zstdTargets.cmake} | 0 archivers/zstd/pkg-plist | 2 +- 6 files changed, 21 insertions(+), 34 deletions(-) diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile index 40687a6a7855..ee47645d3e85 100644 --- a/archivers/zstd/Makefile +++ b/archivers/zstd/Makefile @@ -1,8 +1,8 @@ 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 @@ -17,16 +17,20 @@ 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 @@ -34,36 +38,20 @@ BUILD_TYPE= Debug 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 @@ -9,19 +9,19 @@ # 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) 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 @@ -8,12 +8,12 @@ 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%%) 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 @@ -15,7 +15,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304091339.339Ddeiq081018>