Attachment 238284 Details for Bug 267652 – convert to cmake

[patch] convert to cmake

archivers_zstd-2.diff (text/plain), 2.67 KB, created by Dima Panov on 2022-11-23 21:48:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2022-11-23 21:48:50 UTC

Size: 2.67 KB

patch

obsolete

>diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
>index 150efe318424..4ac95d8e610e 100644
>--- a/archivers/zstd/Makefile
>+++ b/archivers/zstd/Makefile
>@@ -1,42 +1,43 @@
> PORTNAME=	zstd
> PORTVERSION=	1.5.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	archivers
> MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${PORTVERSION}/
> 
>+PATCH_SITES=	https://github.com/facebook/zstd/commit/
>+PATCHFILES+=	a0b09d0ff735d34fd99029bb59ffff2874565b42.diff:-p1
>+
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Fast real-time compression algorithm
> WWW=		https://facebook.github.io/zstd/
> 
> LICENSE=	BSD3CLAUSE GPLv2
> LICENSE_COMB=	dual
>-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
>-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
>+LICENSE_FILE_BSD3CLAUSE=${WRKSRC:H:H}/LICENSE
>+LICENSE_FILE_GPLv2=	${WRKSRC:H:H}/COPYING
> 
> LIB_DEPENDS=	liblz4.so:archivers/liblz4
> 
>-USES=		gmake localbase:ldflags tar:zst
>+USES=		cmake localbase:ldflags tar:zst
>+
>+WRKSRC_SUBDIR=	build/cmake
> 
>-ALL_TARGET=	default
> BINARY_ALIAS=	gmd5sum=md5sum
> TEST_TARGET=	test
>-MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
>-		INSTALL_MAN="${INSTALL_MAN}" \
>-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
>-		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
>+
> USE_LDCONFIG=	yes
> 
>+# Respect modern hier(7), manpages goes to share/man
>+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
>+
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> 
> OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
> 
> OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
> 
>-post-build:
>-	cd ${WRKSRC}/programs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} zstd-frugal
>-
> post-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/programs/zstd-frugal ${STAGEDIR}${PREFIX}/bin/zstd-frugal
>-	${LN} -s zstd.1.gz ${STAGEDIR}${PREFIX}/man/man1/zstdmt.1.gz
>+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/programs/zstd-frugal ${STAGEDIR}${PREFIX}/bin/zstd-frugal
>+	${LN} -s zstd.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/zstdmt.1.gz
> 
> .include <bsd.port.mk>
>diff --git a/archivers/zstd/pkg-plist b/archivers/zstd/pkg-plist
>index fbe5a2fadb4c..3f85824b6977 100644
>--- a/archivers/zstd/pkg-plist
>+++ b/archivers/zstd/pkg-plist
>@@ -8,14 +8,18 @@ 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-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/zstd/zstdTargets.cmake
> lib/libzstd.a
> lib/libzstd.so
> lib/libzstd.so.1
> 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
>+share/man/man1/unzstd.1.gz
>+share/man/man1/zstd.1.gz
>+share/man/man1/zstdcat.1.gz
>+share/man/man1/zstdgrep.1.gz
>+share/man/man1/zstdless.1.gz
>+share/man/man1/zstdmt.1.gz

Actions: View | Diff

Attachments on bug 267652: 237956 | 238284 | 240116 | 240158