Attachment #216901 for bug #247100





PORTNAME=	zstd
PORTVERSION=	1.4.5
PORTREVISION=	1
CATEGORIES=	archivers
MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${DISTVERSION}/

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Fast real-time compression algorithm

LICENSE=	BSD3CLAUSE GPLv2
LICENSE_COMB=	dual
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/../../LICENSE
LICENSE_FILE_GPLv2=	${WRKSRC}/../../COPYING

TEST_DEPENDS=	gmd5sum:sysutils/coreutils

USES=		meson pkgconfig python:3.4+,build shebangfix

SHEBANG_FILES=	GetZstdLibraryVersion.py \
		InstallSymlink.py \

OPTIONS_DEFINE=	LZ4 OPTIMIZED_CFLAGS TEST
OPTIONS_DEFAULT=LZ4

MESON_ARGS=	-Ddefault_library=both

ALL_TARGET=	default
TEST_TARGET=	test
USE_LDCONFIG=	yes

WRKSRC_SUBDIR=	build/meson

PLIST_SUB=	PORTVERSION=${PORTVERSION}

OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
USE_GITHUB=	yes

LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
LZ4_USES=		localbase:ldflags
LZ4_MESON_ENABLED=	lz4

TEST_MESON_TRUE=	bin_tests
	@${REINPLACE_CMD} -e 's|INSTALL_|BSD_&|' ${WRKSRC}/lib/Makefile ${WRKSRC}/programs/Makefile

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/archivers/zstd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590421090	1	TIMESTAMP = 1596179551
2	SHA256 (facebook-zstd-v1.4.5_GH0.tar.gz) = 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2	2	SHA256 (zstd-1.4.5.tar.gz) = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
3	SIZE (facebook-zstd-v1.4.5_GH0.tar.gz) = 1987927	3	SIZE (zstd-1.4.5.tar.gz) = 1973695




--- tests/meson.build.orig	2020-06-08 14:30:42 UTC
+++ tests/meson.build
@@ -143,16 +143,6 @@ checkTag = executable('checkTag',
 # Tests (Use "meson test --list" to list all tests)
 # =============================================================================
 
-if tests_supported_oses.contains(host_machine_os)
-  valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: true)
-  valgrindTest_py = files('valgrindTest.py')
-  test('valgrindTest',
-    valgrindTest_py,
-    args: [valgrind_prog.path(), zstd, datagen, fuzzer, fullbench],
-    depends: [zstd, datagen, fuzzer, fullbench],
-    timeout: 600) # Timeout should work on HDD drive
-endif
-
 if host_machine_os != os_windows
   playTests_sh = find_program(join_paths(zstd_rootdir, 'tests/playTests.sh'), required: true)
   test('test-zstd',

Lines 1-5 Link Here

(-)b/archivers/zstd/pkg-plist (-1 / +2 lines)
1	bin/unzstd	1	bin/unzstd
2	bin/zstd	2	bin/zstd
		3	bin/zstd-frugal
3	bin/zstdcat	4	bin/zstdcat
4	bin/zstdgrep	5	bin/zstdgrep
5	bin/zstdless	6	bin/zstdless
Lines 18-20 man/man1/zstd.1.gz Link Here
18	man/man1/zstdcat.1.gz	19	man/man1/zstdcat.1.gz
19	man/man1/zstdgrep.1.gz	20	man/man1/zstdgrep.1.gz
20	man/man1/zstdless.1.gz	21	man/man1/zstdless.1.gz
21	-	22	man/man1/zstdmt.1.gz

Return to bug 247100

Lines 3-37 Link Here

(-)b/archivers/zstd/Makefile (-11 / +18 lines)
3		3
4	PORTNAME= zstd	4	PORTNAME= zstd
5	PORTVERSION= 1.4.5	5	PORTVERSION= 1.4.5
6	DISTVERSIONPREFIX= v	6	PORTREVISION= 1
7	CATEGORIES= archivers	7	CATEGORIES= archivers
		8	MASTER_SITES= https://github.com/facebook/zstd/releases/download/v${DISTVERSION}/
8		9
9	MAINTAINER= sunpoet@FreeBSD.org	10	MAINTAINER= sunpoet@FreeBSD.org
10	COMMENT= Fast real-time compression algorithm	11	COMMENT= Fast real-time compression algorithm
11		12
12	LICENSE= BSD3CLAUSE GPLv2	13	LICENSE= BSD3CLAUSE GPLv2
13	LICENSE_COMB= dual	14	LICENSE_COMB= dual
14	LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE	15	LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/../../LICENSE
15	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING	16	LICENSE_FILE_GPLv2= ${WRKSRC}/../../COPYING
16		17
17	OPTIONS_DEFINE= LZ4	18	TEST_DEPENDS= gmd5sum:sysutils/coreutils
		19
		20	USES= meson pkgconfig python:3.4+,build shebangfix
		21
		22	SHEBANG_FILES= GetZstdLibraryVersion.py \
		23	InstallSymlink.py \
		24
		25	OPTIONS_DEFINE= LZ4 OPTIMIZED_CFLAGS TEST
18	OPTIONS_DEFAULT=LZ4	26	OPTIONS_DEFAULT=LZ4
19		27
20	USES= gmake	28	MESON_ARGS= -Ddefault_library=both
21		29
22	ALL_TARGET= default
23	TEST_TARGET= test
24	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
25		31
		32	WRKSRC_SUBDIR= build/meson
		33
26	PLIST_SUB= PORTVERSION=${PORTVERSION}	34	PLIST_SUB= PORTVERSION=${PORTVERSION}
27		35
28	GH_ACCOUNT= facebook	36	OPTIMIZED_CFLAGS_VARS= CFLAGS+=-O3
29	USE_GITHUB= yes
30		37
31	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4	38	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
32	LZ4_USES= localbase:ldflags	39	LZ4_USES= localbase:ldflags
		40	LZ4_MESON_ENABLED= lz4
33		41
34	post-patch:	42	TEST_MESON_TRUE= bin_tests
35	@${REINPLACE_CMD} -e 's\|INSTALL_\|BSD_&\|' ${WRKSRC}/lib/Makefile ${WRKSRC}/programs/Makefile
36		43
37	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Added Link Here

(-)b/archivers/zstd/files/patch-tests_meson.build (+19 lines)
1	--- tests/meson.build.orig 2020-06-08 14:30:42 UTC
2	+++ tests/meson.build
3	@@ -143,16 +143,6 @@ checkTag = executable('checkTag',
4	# Tests (Use "meson test --list" to list all tests)
5	# =============================================================================
6
7	-if tests_supported_oses.contains(host_machine_os)
8	- valgrind_prog = find_program('valgrind', ['/usr/bin/valgrind'], required: true)
9	- valgrindTest_py = files('valgrindTest.py')
10	- test('valgrindTest',
11	- valgrindTest_py,
12	- args: [valgrind_prog.path(), zstd, datagen, fuzzer, fullbench],
13	- depends: [zstd, datagen, fuzzer, fullbench],
14	- timeout: 600) # Timeout should work on HDD drive
15	-endif
16	-
17	if host_machine_os != os_windows
18	playTests_sh = find_program(join_paths(zstd_rootdir, 'tests/playTests.sh'), required: true)
19	test('test-zstd',