From owner-svn-ports-all@freebsd.org Wed Aug 19 16:26:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 81DD83C395C; Wed, 19 Aug 2020 16:26:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BWtTG4Fprz4BGx; Wed, 19 Aug 2020 16:26:42 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3663525B97; Wed, 19 Aug 2020 16:26:39 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07JGQdAf083743; Wed, 19 Aug 2020 16:26:39 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07JGQcdA083738; Wed, 19 Aug 2020 16:26:38 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202008191626.07JGQcdA083738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 19 Aug 2020 16:26:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545439 - in head/archivers/zstd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/archivers/zstd: . files X-SVN-Commit-Revision: 545439 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2020 16:26:46 -0000 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 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 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