Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Aug 2020 16:26:38 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545439 - in head/archivers/zstd: . files
Message-ID:  <202008191626.07JGQcdA083738@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Wed Aug 19 16:26:38 2020
New Revision: 545439
URL: https://svnweb.freebsd.org/changeset/ports/545439

Log:
  Change build system from gmake to meson
  
  - Use upstream release tarball
  - Add OPTIMIZED_CFLAGS and TEST options
  - Remove valgrind test
  - Bump PORTREVISION for package change
  
  PR:		247100
  Submitted by:	Daniel Engberg <daniel.engberg.lists@pyret.net>

Added:
  head/archivers/zstd/files/
  head/archivers/zstd/files/patch-tests-meson.build   (contents, props changed)
Modified:
  head/archivers/zstd/Makefile
  head/archivers/zstd/distinfo
  head/archivers/zstd/pkg-plist

Modified: head/archivers/zstd/Makefile
==============================================================================
--- head/archivers/zstd/Makefile	Wed Aug 19 16:26:33 2020	(r545438)
+++ head/archivers/zstd/Makefile	Wed Aug 19 16:26:38 2020	(r545439)
@@ -3,35 +3,37 @@
 
 PORTNAME=	zstd
 PORTVERSION=	1.4.5
-DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
+MASTER_SITES=	https://github.com/facebook/zstd/releases/download/v${PORTVERSION}/
 
 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
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/../../LICENSE
+LICENSE_FILE_GPLv2=	${WRKSRC}/../../COPYING
 
-OPTIONS_DEFINE=	LZ4
-OPTIONS_DEFAULT=LZ4
+TEST_DEPENDS=	gmd5sum:sysutils/coreutils
 
-USES=		gmake
+USES=		meson pkgconfig python:3.4+,build shebangfix
 
-ALL_TARGET=	default
-TEST_TARGET=	test
+MESON_ARGS=	-Ddefault_library=both
 USE_LDCONFIG=	yes
+WRKSRC_SUBDIR=	build/meson
 
+SHEBANG_FILES=	*.py
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-GH_ACCOUNT=	facebook
-USE_GITHUB=	yes
+OPTIONS_DEFINE=	LZ4 OPTIMIZED_CFLAGS TEST
+OPTIONS_DEFAULT=LZ4
 
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
+LZ4_MESON_ENABLED=	lz4
 LZ4_USES=		localbase:ldflags
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|INSTALL_|BSD_&|' ${WRKSRC}/lib/Makefile ${WRKSRC}/programs/Makefile
+OPTIMIZED_CFLAGS_VARS=	CFLAGS+=-O3
+TEST_MESON_TRUE=	bin_tests
 
 .include <bsd.port.mk>

Modified: head/archivers/zstd/distinfo
==============================================================================
--- head/archivers/zstd/distinfo	Wed Aug 19 16:26:33 2020	(r545438)
+++ head/archivers/zstd/distinfo	Wed Aug 19 16:26:38 2020	(r545439)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590421090
-SHA256 (facebook-zstd-v1.4.5_GH0.tar.gz) = 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
-SIZE (facebook-zstd-v1.4.5_GH0.tar.gz) = 1987927
+TIMESTAMP = 1597570087
+SHA256 (zstd-1.4.5.tar.gz) = 98e91c7c6bf162bf90e4e70fdbc41a8188b9fa8de5ad840c401198014406ce9e
+SIZE (zstd-1.4.5.tar.gz) = 1973695

Added: head/archivers/zstd/files/patch-tests-meson.build
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/zstd/files/patch-tests-meson.build	Wed Aug 19 16:26:38 2020	(r545439)
@@ -0,0 +1,27 @@
+--- tests/meson.build.orig	2020-05-22 05:04:00 UTC
++++ tests/meson.build
+@@ -143,15 +143,15 @@ 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 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)

Modified: head/archivers/zstd/pkg-plist
==============================================================================
--- head/archivers/zstd/pkg-plist	Wed Aug 19 16:26:33 2020	(r545438)
+++ head/archivers/zstd/pkg-plist	Wed Aug 19 16:26:38 2020	(r545439)
@@ -1,5 +1,6 @@
 bin/unzstd
 bin/zstd
+bin/zstd-frugal
 bin/zstdcat
 bin/zstdgrep
 bin/zstdless
@@ -18,3 +19,4 @@ 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008191626.07JGQcdA083738>